diff --git a/packages/svelte2tsx/src/svelte2tsx/index.ts b/packages/svelte2tsx/src/svelte2tsx/index.ts
index 72ee25cb5..87b1c051c 100644
--- a/packages/svelte2tsx/src/svelte2tsx/index.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/index.ts
@@ -9,7 +9,7 @@ import { ComponentEvents } from './nodes/ComponentEvents';
 import { EventHandler } from './nodes/event-handler';
 import { ExportedNames } from './nodes/ExportedNames';
 import { createClassGetters, createRenderFunctionGetterStr } from './nodes/exportgetters';
-import { createClassSetters, createRenderFunctionSetterStr } from './nodes/exportsetters';
+import { createClassAccessors } from './nodes/exportaccessors';
 import {
     handleScopeAndResolveForSlot,
     handleScopeAndResolveLetVarForSlot
@@ -46,7 +46,8 @@ interface AddComponentExportPara {
     strictEvents: boolean;
     isTsFile: boolean;
     getters: Set<string>;
-    setters: Set<string>;
+    usesAccessors: boolean;
+    exportedNames: ExportedNames;
     fileName?: string;
     componentDocumentation: ComponentDocumentation;
 }
@@ -316,7 +317,8 @@ function addComponentExport({
     strictEvents,
     isTsFile,
     getters,
-    setters,
+    usesAccessors,
+    exportedNames,
     fileName,
     componentDocumentation
 }: AddComponentExportPara) {
@@ -341,7 +343,7 @@ function addComponentExport({
             className ? ` ${className}` : ''
         } extends createSvelte2TsxComponent(${propDef}) {` +
         createClassGetters(getters) +
-        createClassSetters(setters) +
+        (usesAccessors ? createClassAccessors(getters, exportedNames) : '') +
         '\n}';
 
     str.append(statement);
@@ -382,7 +384,6 @@ function createRenderFunction({
     scriptDestination,
     slots,
     getters,
-    setters,
     events,
     exportedNames,
     isTsFile,
@@ -437,10 +438,9 @@ function createRenderFunction({
         '}';
 
     const returnString =
-        `\nreturn { props: ${exportedNames.createPropsStr(
-            isTsFile
-        )}, slots: ${slotsAsDef}, getters: ${createRenderFunctionGetterStr(getters)}` +
-        `, setters: ${createRenderFunctionSetterStr(setters)}` +
+        `\nreturn { props: ${exportedNames.createPropsStr(isTsFile)}` +
+        `, slots: ${slotsAsDef}` +
+        `, getters: ${createRenderFunctionGetterStr(getters)}` +
         `, events: ${events.toDefString()} }}`;
 
     // wrap template with callback
@@ -499,24 +499,17 @@ export function svelte2tsx(
     //move the instance script and process the content
     let exportedNames = new ExportedNames();
     let getters = new Set<string>();
-    let setters = new Set<string>();
     if (scriptTag) {
         //ensure it is between the module script and the rest of the template (the variables need to be declared before the jsx template)
         if (scriptTag.start != instanceScriptTarget) {
             str.move(scriptTag.start, scriptTag.end, instanceScriptTarget);
         }
-        const res = processInstanceScriptContent(
-            str,
-            scriptTag,
-            events,
-            implicitStoreValues,
-            usesAccessors
-        );
+        const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues);
         uses$$props = uses$$props || res.uses$$props;
         uses$$restProps = uses$$restProps || res.uses$$restProps;
         uses$$slots = uses$$slots || res.uses$$slots;
 
-        ({ exportedNames, events, getters, setters } = res);
+        ({ exportedNames, events, getters } = res);
     }
 
     //wrap the script tag and template content in a function returning the slot and exports
@@ -527,7 +520,6 @@ export function svelte2tsx(
         slots,
         events,
         getters,
-        setters,
         exportedNames,
         isTsFile: options?.isTsFile,
         uses$$props,
@@ -551,7 +543,8 @@ export function svelte2tsx(
         strictEvents: events.hasInterface(),
         isTsFile: options?.isTsFile,
         getters,
-        setters,
+        exportedNames,
+        usesAccessors,
         fileName: options?.filename,
         componentDocumentation
     });
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/exportaccessors.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/exportaccessors.ts
new file mode 100644
index 000000000..e7c21e16a
--- /dev/null
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/exportaccessors.ts
@@ -0,0 +1,18 @@
+import { ExportedNames } from './ExportedNames';
+
+const createClassAccessor = (name: string) =>
+    `\n    get ${name}() { return render().props.${name} }` +
+    `\n    /**accessor*/\n    set ${name}(_) {}`;
+
+export const createClassAccessors = (getters: Set<string>, exportedNames: ExportedNames) => {
+    const accessors: string[] = [];
+    for (const [name, value] of exportedNames) {
+        if (getters.has(name)) {
+            continue;
+        }
+
+        accessors.push(value.identifierText);
+    }
+
+    return accessors.map(createClassAccessor).join('');
+};
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/exportgetters.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/exportgetters.ts
index 93947be33..0d3176075 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/exportgetters.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/exportgetters.ts
@@ -1,8 +1,10 @@
-export const createClassGetter = (name: string) =>
+const createClassGetter = (name: string) =>
     `\n    get ${name}() { return render().getters.${name} }`;
+
 export const createClassGetters = (names: Set<string>) => {
     return Array.from(names).map(createClassGetter).join('');
 };
+
 export function createRenderFunctionGetterStr(getters: Set<string>) {
     const properties = Array.from(getters).map((name) => `${name}: ${name}`);
     return `{${properties.join(', ')}}`;
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/exportsetters.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/exportsetters.ts
deleted file mode 100644
index 8331ef887..000000000
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/exportsetters.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const createClassSetter = (name: string) =>
-    `\n    /**accessor*/\n    set ${name}(${name}) {}`;
-
-export const createClassSetters = (names: Set<string>) => {
-    return Array.from(names).map(createClassSetter).join('');
-};
-
-export function createRenderFunctionSetterStr(setters: Set<string>) {
-    const properties = Array.from(setters).map((name) => `${name}: ${name}`);
-    return `{${properties.join(', ')}}`;
-}
diff --git a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
index fe3f65c96..2c6785793 100644
--- a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
@@ -21,7 +21,6 @@ export interface InstanceScriptProcessResult {
     uses$$restProps: boolean;
     uses$$slots: boolean;
     getters: Set<string>;
-    setters: Set<string>;
 }
 
 interface PendingStoreResolution {
@@ -34,8 +33,7 @@ export function processInstanceScriptContent(
     str: MagicString,
     script: Node,
     events: ComponentEvents,
-    implicitStoreValues: ImplicitStoreValues,
-    usesAccessors: boolean
+    implicitStoreValues: ImplicitStoreValues
 ): InstanceScriptProcessResult {
     const htmlx = str.original;
     const scriptContent = htmlx.substring(script.content.start, script.content.end);
@@ -49,7 +47,6 @@ export function processInstanceScriptContent(
     const astOffset = script.content.start;
     const exportedNames = new ExportedNames();
     const getters = new Set<string>();
-    const setters = new Set<string>();
 
     const implicitTopLevelNames = new ImplicitTopLevelNames();
     let uses$$props = false;
@@ -104,11 +101,6 @@ export function processInstanceScriptContent(
             const name = identifier.getText();
             const end = declaration.end + astOffset;
 
-            if (usesAccessors) {
-                setters.add(name);
-                getters.add(name);
-            }
-
             str.appendLeft(end, `;${name} = __sveltets_any(${name});`);
         };
 
@@ -507,7 +499,6 @@ export function processInstanceScriptContent(
         uses$$props,
         uses$$restProps,
         uses$$slots,
-        getters,
-        setters
+        getters
     };
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/event-binding.html b/packages/svelte2tsx/test/sourcemaps/event-binding.html
index 883d8e452..e0ada3d18 100644
--- a/packages/svelte2tsx/test/sourcemaps/event-binding.html
+++ b/packages/svelte2tsx/test/sourcemaps/event-binding.html
@@ -4,7 +4,7 @@
                                                                                      1====           2================== 
 <button onclick={(__sveltets_store_get(check), $check) ? method1 : method2} >Bla</button></>
                                        3====           4==================
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/let.html b/packages/svelte2tsx/test/sourcemaps/let.html
index 5e8e18ea1..a6e113a42 100644
--- a/packages/svelte2tsx/test/sourcemaps/let.html
+++ b/packages/svelte2tsx/test/sourcemaps/let.html
@@ -5,7 +5,7 @@
 ;
 () => (<>
 </>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/repl.html b/packages/svelte2tsx/test/sourcemaps/repl.html
index b475760dc..619ad3fee 100644
--- a/packages/svelte2tsx/test/sourcemaps/repl.html
+++ b/packages/svelte2tsx/test/sourcemaps/repl.html
@@ -178,7 +178,7 @@
 	</> : <></>}
 </div>
 </>);
-return { props: {slug: slug , chapter: chapter}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {slug: slug , chapter: chapter}, slots: {}, getters: {}, events: {} }}
 
 export default class extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
index bdfcab9c3..9208f1ff9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
@@ -17,7 +17,7 @@
     {...__sveltets_ensureAnimation((__sveltets_store_get(animateStore), $animateStore)(__sveltets_mapElementTag('div'),__sveltets_AnimationMove,{}))}
 >
 </div></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
index a3eb2a8d6..952d7e61d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
@@ -23,7 +23,7 @@
     (__sveltets_store_get(store), $store).b = false;
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
index d4fee7998..d9ded12d6 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
@@ -3,7 +3,7 @@
 <>{someRecordOrArr[(__sveltets_store_get(store), $store)]}
 {someObject['$store']}
 {someObject.$store}</>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 9bb7cfc8f..81fc133cb 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
@@ -4,7 +4,7 @@
      let [a,b,c] = [1,2,3];
 ;
 () => (<></>);
-return { props: {a: a , b: b , c: c}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {a: a , b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 9c69724b3..a42d802b2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
@@ -2,7 +2,7 @@
 <></>;function render() {
 ;(__sveltets_store_get(var), $var);
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 be6ac5021..9cc76869b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
@@ -2,7 +2,7 @@
 <></>;function render() {
    ;(__sveltets_store_get(var), $var);
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 cb6347406..83037d66e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
@@ -13,7 +13,7 @@ function render() {
 </>; __sveltets_awaitThen(_$$p, (data) => {<>
 	{data}
 </>})}}</>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 4136d20fa..e94180488 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><input id="dom-input" type="radio" {...__sveltets_empty((__sveltets_store_get(compile_options), $compile_options).generate)} value="dom"/></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 642368490..6430a0658 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
@@ -88,7 +88,7 @@
 		<input type="range" value={selected.r} oninput={adjust}/>
 	</div>
 </> : <></>}</>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx
index 5247c0ba1..db2c8744a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx
@@ -6,7 +6,7 @@
 () => (<>
 
 </>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 62162d63f..934f5399f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
@@ -7,7 +7,7 @@
 <div>
     <slot a={b}>Hello</slot>
 </div></>);
-return { props: {}, slots: {'default': {a:b}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:b}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-constant/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-constant/expected.tsx
index 5481911a7..a38908b16 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-constant/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-constant/expected.tsx
@@ -13,7 +13,7 @@
     }
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} as unknown as ComponentEvents }}
+return { props: {}, slots: {}, getters: {}, events: {} as unknown as ComponentEvents }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-string-literals/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-string-literals/expected.tsx
index b6ce66054..6845dc046 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-string-literals/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-string-literals/expected.tsx
@@ -11,7 +11,7 @@
     }
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} as unknown as ComponentEvents }}
+return { props: {}, slots: {}, getters: {}, events: {} as unknown as ComponentEvents }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx
index 59aa97fbb..80f502100 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx
@@ -11,7 +11,7 @@
     }
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} as unknown as ComponentEvents }}
+return { props: {}, slots: {}, getters: {}, events: {} as unknown as ComponentEvents }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
 }
\ No newline at end of file
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 bdd2282c7..e138e7aff 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
@@ -11,7 +11,7 @@
     <slot name="test" c={d} e={e}></slot>
     <slot name="abc-cde.113"></slot>
 </div></>);
-return { props: {}, slots: {'default': {a:b}, 'test': {c:d, e:e}, 'abc-cde.113': {}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:b}, 'test': {c:d, e:e}, 'abc-cde.113': {}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 a3ae48c75..e3f4382ca 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
@@ -7,7 +7,7 @@
 <div>
     <slot a={b} b={b} c="b" d={`a${b}`} e={b} >Hello</slot>
 </div></>);
-return { props: {}, slots: {'default': {a:b, b:b, c:"b", d:"__svelte_ts_string", e:b}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:b, b:b, c:"b", d:"__svelte_ts_string", e:b}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected.tsx
index 003aee7af..bbc37eb4e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected.tsx
@@ -8,7 +8,7 @@
 {() => {let _$$p = (promise2); __sveltets_awaitThen(_$$p, ({ b }) => {<>
     <slot name="second" a={b}>Hello</slot>
 </>})}}</>
-return { props: {}, slots: {'default': {a:__sveltets_unwrapPromiseLike(promise)}, 'err': {err:__sveltets_any({})}, 'second': {a:(({ b }) => b)(__sveltets_unwrapPromiseLike(promise2))}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_unwrapPromiseLike(promise)}, 'err': {err:__sveltets_any({})}, 'second': {a:(({ b }) => b)(__sveltets_unwrapPromiseLike(promise2))}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected.tsx
index c4c0f58f9..0cc4ec2ea 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected.tsx
@@ -6,7 +6,7 @@
 {__sveltets_each(items2, ({ a }) => <>
     <slot name="second" a={a}>Hello</slot>
 </>)}</>
-return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items)}, 'second': {a:(({ a }) => a)(__sveltets_unwrapArr(items2))}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items)}, 'second': {a:(({ a }) => a)(__sveltets_unwrapArr(items2))}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected.tsx
index 301c664d6..5eed7c7de 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected.tsx
@@ -5,7 +5,7 @@
         <slot a={a}></slot>
     </div></>}}
 </Component></>
-return { props: {}, slots: {'default': {a:__sveltets_instanceOf(Component).$$slot_def['b'].a}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_instanceOf(Component).$$slot_def['b'].a}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected.tsx
index 24162d3d6..1f9f773d8 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected.tsx
@@ -3,7 +3,7 @@
 <><Component   >{() => { let {name:n, thing, whatever:{ bla }} = __sveltets_instanceOf(Component).$$slot_def['default'];<>
     <slot n={n} thing={thing} bla={bla} />
 </>}}</Component></>
-return { props: {}, slots: {'default': {n:__sveltets_instanceOf(Component).$$slot_def['default'].name, thing:__sveltets_instanceOf(Component).$$slot_def['default'].thing, bla:(({ bla }) => bla)(__sveltets_instanceOf(Component).$$slot_def['default'].whatever)}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {n:__sveltets_instanceOf(Component).$$slot_def['default'].name, thing:__sveltets_instanceOf(Component).$$slot_def['default'].thing, bla:(({ bla }) => bla)(__sveltets_instanceOf(Component).$$slot_def['default'].whatever)}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected.tsx
index 41ac02868..6e13676a0 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected.tsx
@@ -11,7 +11,7 @@
     {d}
 </>})}}
 <slot name="third" d={d} c={c}></slot></>
-return { props: {}, slots: {'default': {a:(({ a }) => a)(__sveltets_unwrapArr(__sveltets_unwrapArr(items)))}, 'second': {a:a}, 'third': {d:d, c:c}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:(({ a }) => a)(__sveltets_unwrapArr(__sveltets_unwrapArr(items)))}, 'second': {a:a}, 'third': {d:d, c:c}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expected.tsx
index 5147f4541..92da42fa5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expected.tsx
@@ -8,7 +8,7 @@ function render() {
 () => (<>
 
 <div><Test >{() => { let {t} = __sveltets_instanceOf(Test).$$slot_def['default'];<>xx</>}}</Test></div></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected.tsx
index 8a633a9c3..82a58df00 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected.tsx
@@ -3,7 +3,7 @@
 <>{__sveltets_each(items, (item) => <>
     <slot a={item} b={{ item }} c={{ item: 'abc' }.item} d={{ item: item }}>Hello</slot>
 </>)}</>
-return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items), b:{ item:__sveltets_unwrapArr(items) }, c:{ item: 'abc' }.item, d:{ item: __sveltets_unwrapArr(items) }}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items), b:{ item:__sveltets_unwrapArr(items) }, c:{ item: 'abc' }.item, d:{ item: __sveltets_unwrapArr(items) }}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected.tsx
index da5b967bc..a4fe90f5b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected.tsx
@@ -3,7 +3,7 @@
 <>{__sveltets_each(items, (items) => <>
     <slot a={items}>Hello</slot>
 </>)}</>
-return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items)}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items)}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 515481ddb..2773d050b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
@@ -3,8 +3,8 @@
 <>
 
 <main>At least I am documented</main></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 /** This component does nothing at all */
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 e0f3fdabe..80f2da819 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
@@ -3,7 +3,7 @@
 <>
 
 <main>At least I am documented</main></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 /**
  * This component has indented multiline documentation:
@@ -19,4 +19,4 @@ return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
  * The output should be indented properly!
  */
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 c48e3f1db..1a682f50a 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
@@ -3,7 +3,7 @@
 <>
 
 <main>At least I am documented</main></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 /**
  * This component has multiline documentation:
@@ -13,4 +13,4 @@ return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
  * ```
  */
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx
index db66fc452..12c868806 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx
@@ -3,7 +3,7 @@
 <>{myfile}
 {(__sveltets_store_get(myfile), $myfile)}{someOtherFile}
 {myfile}{(__sveltets_store_get(someOtherFile), $someOtherFile)}{someThirdFile}</>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx
index ef7b52ac0..84e218959 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <>{a?.}</>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-and-forwarded-event/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-and-forwarded-event/expected.tsx
index f27cf9c62..0514ab40f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-and-forwarded-event/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-and-forwarded-event/expected.tsx
@@ -11,7 +11,7 @@ function render() {
 () => (<>
 
 <input onfocus={undefined} /></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {'focus':__sveltets_mapElementEvent('focus'), 'mount': __sveltets_customEvent} }}
+return { props: {}, slots: {}, getters: {}, events: {'focus':__sveltets_mapElementEvent('focus'), 'mount': __sveltets_customEvent} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 1f5fc1f8c..bd27eda3d 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
@@ -2,7 +2,7 @@
 <></>;function render() {
 <><Button ></Button>
 <Radio ></Radio></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {'click':__sveltets_unionType(__sveltets_bubbleEventDef(__sveltets_instanceOf(Button).$$events_def, 'click'),__sveltets_bubbleEventDef(__sveltets_instanceOf(Radio).$$events_def, 'click'))} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_unionType(__sveltets_bubbleEventDef(__sveltets_instanceOf(Button).$$events_def, 'click'),__sveltets_bubbleEventDef(__sveltets_instanceOf(Radio).$$events_def, 'click'))} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 c40100176..d1ef6f145 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><Button ></Button></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {'click':__sveltets_bubbleEventDef(__sveltets_instanceOf(Button).$$events_def, 'click')} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_bubbleEventDef(__sveltets_instanceOf(Button).$$events_def, 'click')} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 51eb15c75..85c8f2af7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><button onclick={undefined}></button></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {'click':__sveltets_mapElementEvent('click')} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapElementEvent('click')} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 7efc43c60..0789be865 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
@@ -2,7 +2,7 @@
 <></>;function render() {
 <><sveltebody onclick={undefined}></sveltebody>
 <sveltewindow onresize={undefined}></sveltewindow></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {'click':__sveltets_mapBodyEvent('click'), 'resize':__sveltets_mapWindowEvent('resize')} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapBodyEvent('click'), 'resize':__sveltets_mapWindowEvent('resize')} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events-alias/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events-alias/expected.tsx
index 1e3e5ca67..007d13e14 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events-alias/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events-alias/expected.tsx
@@ -18,7 +18,7 @@ function render() {
 () => (<>
 
 <button onclick={() => dispatch('btn', '')}></button></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {'btn': __sveltets_customEvent, 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
+return { props: {}, slots: {}, getters: {}, events: {'btn': __sveltets_customEvent, 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx
index b99a3d9cd..9ab7257f0 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx
@@ -18,7 +18,7 @@ function render() {
 () => (<>
 
 <button onclick={() => dispatch('btn', '')}></button></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {'btn': __sveltets_customEvent, 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
+return { props: {}, slots: {}, getters: {}, events: {'btn': __sveltets_customEvent, 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
index eb9ac3e63..6ed69c5d9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
@@ -4,8 +4,8 @@
      class Foo {};
 ;
 () => (<></>);
-return { props: {Foo: Foo}, slots: {}, getters: {Foo: Foo}, setters: {}, events: {} }}
+return { props: {Foo: Foo}, slots: {}, getters: {Foo: Foo}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
     get Foo() { return render().getters.Foo }
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
index d5febb935..bb65f39b4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
@@ -21,7 +21,7 @@ return { props: {
      */a: a , 
 /**
      * MORE DOCS!
-     */b: b , c: c}, slots: {}, getters: {}, setters: {}, events: {} }}
+     */b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 9b349f7d5..547be7c31 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/expected.tsx
@@ -6,7 +6,7 @@
      let c = 123;
 ;
 () => (<></>);
-return { props: {a: a , b: b , c: c}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {a: a , b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
index 3bccb1646..cc7e3d9cc 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
@@ -6,7 +6,7 @@
     
 ;
 () => (<></>);
-return { props: {name: name , name2: name2}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {name: name , name2: name2}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 98332a6a7..a4019b038 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
@@ -5,7 +5,7 @@
      let name = world;
 ;
 () => (<></>);
-return { props: {name: name}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {name: name}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 3741417a0..00f3d80a1 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
@@ -8,7 +8,7 @@
 () => (<></>);
 return { props: {
 /**@type { string | number }*/name: name , 
-/**@type { string | number }*/world: world}, slots: {}, getters: {}, setters: {}, events: {} }}
+/**@type { string | number }*/world: world}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifier/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifier/expected.tsx
index de5cfb7de..a69c9661f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifier/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifier/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class AslugTestUpperUpper3asd4__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifiers-only/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifiers-only/expected.tsx
index 17b23aaeb..4694e5969 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifiers-only/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifiers-only/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class A0__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 4ab3af0d2..609006d94 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
@@ -7,7 +7,7 @@ function render() {
 ;
 () => (<><Test b="6" ></Test> 
 </>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
index c846abde7..9929f3ebf 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
@@ -11,7 +11,7 @@ function render() {
 ;
 () => (<><h1>hello {world}</h1>
 </>);
-return { props: {world: world}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 f81f6eb08..06f2e12f7 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
@@ -2,7 +2,7 @@
 <></>;let b = 5;;<></>;function render() {
  let world = "name";
 () => (<><h1>hello {world}</h1></>);
-return { props: {world: world}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 f81f6eb08..06f2e12f7 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
@@ -2,7 +2,7 @@
 <></>;let b = 5;;<></>;function render() {
  let world = "name";
 () => (<><h1>hello {world}</h1></>);
-return { props: {world: world}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 a5eaa0a87..c5264bde7 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
@@ -9,7 +9,7 @@
 () => (<>
 
 <h1>hello {world}</h1></>);
-return { props: {world: world}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 f9a2c6b34..83f5a7ebd 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
@@ -9,7 +9,7 @@
 () => (<><h1>hello {world}</h1>
 
 </>);
-return { props: {world: world}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 1f667fbb1..a6aebe50c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
@@ -23,7 +23,7 @@ const test4 = ({a,  b: { $top1: $top2 }}) => $top2 && (__sveltets_store_get(top1
 
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 8a2266b9e..aae0984d7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
@@ -25,7 +25,7 @@
     const test4 = ({a,  b: { $top1: $top2 }}) => $top2 && (__sveltets_store_get(top1), $top1)
 
 }}>Hi</h1></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 8481ccae3..543fbc97e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
@@ -4,7 +4,7 @@
      let { name: rename } = { name: "world" };
 ;
 () => (<></>);
-return { props: {rename: rename}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {rename: rename}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx
index f9a71c8db..f301ffc62 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx
@@ -18,7 +18,7 @@ $: ({ bla4, bla5 } = __sveltets_invalidate(() => (__sveltets_store_get(data), $d
 $: ([ bla4, bla5 ] = __sveltets_invalidate(() => (__sveltets_store_get(data), $data)))
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
index 98f1b120b..c352b87cf 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
@@ -7,7 +7,7 @@ let a: 1 | 2 = 1;
 }}
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx
index ed6614604..d26b32fdd 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx
@@ -4,7 +4,7 @@
     ;() => {$: { break $; }}
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 416894a43..84de7ae23 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
@@ -5,7 +5,7 @@
 let  b = __sveltets_invalidate(() => ({ a: 1 }));
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expected.tsx
index 763e76c39..8e9f52da2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expected.tsx
@@ -10,7 +10,7 @@ let a;
 $: a = __sveltets_invalidate(() => 5);
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
index 626df3ef7..00ff97091 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
@@ -8,7 +8,7 @@ let a;
 $: a = __sveltets_invalidate(() => 5);
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 e736909f4..140603366 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
@@ -4,7 +4,7 @@
     $: store.set( __sveltets_invalidate(() => (__sveltets_store_get(store), $store) + 1));
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
index 7c45b7f30..842668b96 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
@@ -6,7 +6,7 @@
     
 ;
 () => (<></>);
-return { props: {name3: name , name4: name2}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {name3: name , name4: name2}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 25560c17e..8c892208b 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
@@ -9,7 +9,7 @@
 () => (<>
 <h1>hello {world}</h1>
 </>);
-return { props: {world: world}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 e6fc767a0..a61eeb412 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
@@ -13,7 +13,7 @@
   <link rel="stylesheet" href="/lib/jodit.es2018.min.css" />
   
 </sveltehead></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 0a077d24c..da455257a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
@@ -5,7 +5,7 @@
 ;
 () => (<><h1>hello {world}</h1>
 </>);
-return { props: {world: world}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 a8864fbcd..2f18efe6c 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
@@ -9,7 +9,7 @@
     <p></p>
 </Script>
 <Style /></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 66655c139..77729aa4c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
@@ -8,7 +8,7 @@ let a = 'b';
 ;
 () => (<><Test b="6" />
 </>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
index 4e95d8199..ca20e0684 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><h1>hello</h1></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
index d2036e441..c68182653 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
@@ -4,7 +4,7 @@
      let name = "world"
 ;
 () => (<></>);
-return { props: {name: name}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {name: name}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx
index b8d369042..830f1c5c0 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><slot name="s" {...__sveltets_ensureType(HTMLSlotElement, s)} /></>
-return { props: {}, slots: {'s': {}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'s': {}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx
index c3585f4f7..48a5e62ed 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx
@@ -11,7 +11,7 @@
 <p>{(__sveltets_store_get(store2), $store2)}</p>
 <p>{(__sveltets_store_get(store3), $store3)}</p>
 <p>{(__sveltets_store_get(store4), $store4)}</p></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx
index 3c52f386c..81360a395 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx
@@ -14,7 +14,7 @@
 
 <p>{(__sveltets_store_get(store2), $store2)}</p>
 <p>{(__sveltets_store_get(store4), $store4)}</p></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expected.tsx
index de8374411..e26ad8065 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expected.tsx
@@ -9,7 +9,7 @@
 <p>{(__sveltets_store_get(store), $store)}</p>
 <p>{(__sveltets_store_get(store1), $store1)}</p>
 <p>{(__sveltets_store_get(store2), $store2)}</p></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx
index 2b89e0c3f..680fbbe20 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx
@@ -14,7 +14,7 @@ function render() {
 <p>{(__sveltets_store_get(storeA), $storeA)}</p>
 <p>{(__sveltets_store_get(storeB), $storeB)}</p>
 <p>{(__sveltets_store_get(storeC), $storeC)}</p></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx
index 3c27af5a6..90e6e41ca 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx
@@ -22,7 +22,7 @@
 <p>{(__sveltets_store_get(store), $store)['prop']['anotherProp']}</p>
 <p>{(__sveltets_store_get(store), $store)?.prop.anotherProp}</p>
 <p>{(__sveltets_store_get(store), $store)?.prop?.anotherProp}</p></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
index 82143ac27..2ef201bfe 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><Me f={`${(__sveltets_store_get(s), $s)} `}/></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expected.tsx
index 25bca4853..c965763d1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expected.tsx
@@ -2,7 +2,7 @@
 <></>;function render() {
 <><iframe src="" />
 </>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 e9dfde48f..b62ad4be3 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
@@ -4,7 +4,7 @@
 
 
 {true === true}</>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
index 583a6ab5f..e7d8d4fe0 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
index 583a6ab5f..e7d8d4fe0 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expected.tsx
index c8509c837..a1a907310 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expected.tsx
@@ -31,7 +31,7 @@ function render() {
 () => (<>
 
 <button onclick={() => dispatch('btn', '')}></button></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: __sveltets_toEventTypings<{
+return { props: {}, slots: {}, getters: {}, events: __sveltets_toEventTypings<{
     /**
      * A DOC
      */
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 5327de099..08dfcf9a9 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
@@ -7,7 +7,7 @@
     }
 ;
 () => (<></>);
-return { props: {f: f} as {f?: typeof f}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {f: f} as {f?: typeof f}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
index 04c40f28f..d75d7c8be 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
@@ -8,7 +8,7 @@
      let a1 = true;a1 = __sveltets_any(a1);;let  a2 = false;a2 = __sveltets_any(a2);;let  b1: boolean = true;b1 = __sveltets_any(b1);;let  b2: boolean = false;b2 = __sveltets_any(b2);;
 ;
 () => (<></>);
-return { props: {bla: bla , blubb: blubb , bla1: bla1 , blubb1: blubb1 , a1: a1 , a2: a2 , b1: b1 , b2: b2} as {bla?: typeof bla, blubb?: typeof blubb, bla1?: boolean, blubb1?: boolean, a1?: typeof a1, a2?: typeof a2, b1?: boolean, b2?: boolean}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {bla: bla , blubb: blubb , bla1: bla1 , blubb1: blubb1 , a1: a1 , a2: a2 , b1: b1 , b2: b2} as {bla?: typeof bla, blubb?: typeof blubb, bla1?: boolean, blubb1?: boolean, a1?: typeof a1, a2?: typeof a2, b1?: boolean, b2?: boolean}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 7552b3382..b7550f665 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
@@ -5,10 +5,10 @@
      const SOME = 1, CONSTANT = 2;
 ;
 () => (<></>);
-return { props: {name: name , SOME: SOME , CONSTANT: CONSTANT} as {name?: string, SOME?: typeof SOME, CONSTANT?: typeof CONSTANT}, slots: {}, getters: {name: name, SOME: SOME, CONSTANT: CONSTANT}, setters: {}, events: {} }}
+return { props: {name: name , SOME: SOME , CONSTANT: CONSTANT} as {name?: string, SOME?: typeof SOME, CONSTANT?: typeof CONSTANT}, slots: {}, getters: {name: name, SOME: SOME, CONSTANT: CONSTANT}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
     get name() { return render().getters.name }
     get SOME() { return render().getters.SOME }
     get CONSTANT() { return render().getters.CONSTANT }
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx
index 7a7ea9050..629902bb3 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx
@@ -16,7 +16,7 @@ return { props: {
 /**
      * DOCS!
      * 
-     */a: a}, slots: {}, getters: {}, setters: {}, events: {} }}
+     */a: a}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
index d337e4af5..11143ad5e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
@@ -21,7 +21,7 @@ return { props: {a: a , b: b , c: c , d: d} as {
      */a: string, 
 /**
      * MORE DOCS!
-     */b?: typeof b, c: typeof c, d: typeof d}, slots: {}, getters: {}, setters: {}, events: {} }}
+     */b?: typeof b, c: typeof c, d: typeof d}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 cce4a92bf..7835fdc4b 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
@@ -4,7 +4,7 @@
      let a = '';
 ;
 () => (<></>);
-return { props: {a: a} as {a?: typeof a}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {a: a} as {a?: typeof a}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 bdb72e792..f697b16fb 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
@@ -6,7 +6,7 @@
      let b: A = {};b = __sveltets_any(b);;
 ;
 () => (<></>);
-return { props: {a: a , b: b} as {a: A, b?: A}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {a: a , b: b} as {a: A, b?: A}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 18d86fa2c..91a0d93bc 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
@@ -3,7 +3,7 @@
     export interface A {}
 ;<></>;function render() {
 <></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 2dfa44aa6..f485bffbc 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/expected.tsx
@@ -6,7 +6,7 @@
      let c: number = 123;c = __sveltets_any(c);;
 ;
 () => (<></>);
-return { props: {a: a , b: b , c: c} as {a: number, b: number | undefined, c?: number}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {a: a , b: b , c: c} as {a: number, b: number | undefined, c?: number}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render)) {
-}
+}
\ No newline at end of file
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 f06fb217e..827a570c0 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
@@ -6,7 +6,7 @@
 ;
 () => (<>
 <h1>{number1} + {number2} = {number1 + number2}</h1></>);
-return { props: {number1: number1 , number2: number2} as {number1: number, number2: number}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {number1: number1 , number2: number2} as {number1: number, number2: number}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx
index 1fb1081f8..02a2be799 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx
@@ -5,7 +5,7 @@
 ;
 () => (<>
 </>);
-return { props: {foo: foo} as {foo: string}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {foo: foo} as {foo: string}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
index c48990fca..1853e99e1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
@@ -4,7 +4,7 @@
     let a = document.querySelector('#id') as HTMLInputElement;
 ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 ea476df8b..dcda67e59 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
@@ -4,7 +4,7 @@
      let name: string | number = "world";name = __sveltets_any(name);
 ;
 () => (<></>);
-return { props: {name: name} as {name?: string | number}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {name: name} as {name?: string | number}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 220afa52c..4c053bf2d 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
@@ -3,7 +3,7 @@
  ;
 () => (<>
 <h1>{$$props['name']}</h1></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx
index b58a73f8d..8928b93d2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx
@@ -3,7 +3,7 @@
  ;
 () => (<>
 <h1>{$$props['name']}</h1></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts_with_any(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 36b276945..69828236e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
@@ -5,7 +5,7 @@
 ;
 () => (<><h1>{name}</h1>
 </>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
index 7d5172d99..cdf104cb3 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() { let $$props = __sveltets_allPropsType();
 <><h1>{$$props['name']}</h1></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
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 89dce7d9a..2244babe1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
@@ -5,7 +5,7 @@
 ;
 () => (<><h1>{name}</h1>
 </>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
index b002c875b..12b9a7152 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() { let $$restProps = __sveltets_restPropsType();
 <><h1>{$$restProps['name']}</h1></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx
index 155107a4b..1573553c7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx
@@ -10,7 +10,7 @@
 <slot name="foo" />
 <slot name="dashed-name" />
 <slot /></>);
-return { props: {}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx
index f71d31716..11be08ea7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx
@@ -6,7 +6,7 @@
 <slot name="foo" />
 <slot name="dashed-name" />
 <slot /></>
-return { props: {}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx
index d3b53fe2b..f98115f29 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx
@@ -12,7 +12,7 @@
 	}
   ;
 () => (<></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 2d600994d..bdb3fb921 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
@@ -2,7 +2,7 @@
 <></>;function render() {
 <><Component  />{__sveltets_instanceOf(Component).$on('click', (__sveltets_store_get(check), $check) ? method1 : method2)}
 <button onclick={(__sveltets_store_get(check), $check) ? method1 : method2} >Bla</button></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expected.tsx
index 44b4b7c78..e4fc30d92 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expected.tsx
@@ -18,7 +18,7 @@
 {(__sveltets_store_get(store8), $store8)}
 {(__sveltets_store_get(store9), $store9)}
 {(__sveltets_store_get(store10), $store10)}</>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 980e4a1fa..93d6abf3d 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
@@ -33,7 +33,7 @@ function render() {
 <button onclick={() => count.set( $count & myvar)}>AND</button>
 <button onclick={() => count.set( $count ^ myvar)}>XOR</button>
 <button onclick={() => count.set( $count | myvar)}>OR</button></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 8260ac4f6..7e2e72548 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
@@ -10,7 +10,7 @@ function render() {
 () => (<>
 
 <button onclick={() => !(__sveltets_store_get(count), $count)}>add</button></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 5470d49c4..b5e3904c2 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,7 +13,7 @@ function render() {
 <button onclick={() => count.set( $count + 1)}>add</button>
 <button onclick={() => count.set( $count - 1)}>subtract</button>
 <button onclick={() => count.set( $count + 1)}>add</button></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
index e92908386..88718d84d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
@@ -3,7 +3,7 @@
 b.set((__sveltets_store_get(b), $b).concat(5));
 () => (<>
 <h1 onclick={() => b.set((__sveltets_store_get(b), $b).concat(5))}>{(__sveltets_store_get(b), $b)}</h1></>);
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected.tsx
index 1e2d7ee36..5fcedfa9d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected.tsx
@@ -6,7 +6,7 @@
 ;
 () => (<><svelteoptions />
 </>);
-return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, setters: {}, events: {} }}
+return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
     get bar() { return render().getters.bar }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected.tsx
index 463521165..919476fca 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected.tsx
@@ -2,15 +2,24 @@
 <></>;function render() {
 
 	 let foo: number = undefined;foo = __sveltets_any(foo);
+	 let foo2 = undefined
+	let clazz: string
+	
 	 const bar: string = ''
 ;
 () => (<><svelteoptions accessors />
 </>);
-return { props: {foo: foo , bar: bar}, slots: {}, getters: {foo: foo, bar: bar}, setters: {foo: foo}, events: {} }}
+return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-    get foo() { return render().getters.foo }
     get bar() { return render().getters.bar }
+    get foo() { return render().props.foo }
     /**accessor*/
-    set foo(foo) {}
+    set foo(_) {}
+    get foo2() { return render().props.foo2 }
+    /**accessor*/
+    set foo2(_) {}
+    get class() { return render().props.class }
+    /**accessor*/
+    set class(_) {}
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/input.svelte
index c43a5ec1c..06f12463d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/input.svelte
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/input.svelte
@@ -1,5 +1,8 @@
 <svelte:options accessors />
 <script lang="ts">
 	export let foo: number = undefined
+	export let foo2 = undefined
+	let clazz: string
+	export { clazz as class }
 	export const bar: string = ''
 </script>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected.tsx
index 3d38b8e45..810fca3c7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected.tsx
@@ -6,7 +6,7 @@
 ;
 () => (<><svelteoptions accessors={false} />
 </>);
-return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, setters: {}, events: {} }}
+return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
     get bar() { return render().getters.bar }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected.tsx
index dfdf2208c..83e4dedcc 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected.tsx
@@ -2,15 +2,24 @@
 <></>;function render() {
 
 	 let foo: number = undefined;foo = __sveltets_any(foo);
+	 let foo2 = undefined
+	let clazz: string
+	
 	 const bar: string = ''
 ;
 () => (<><svelteoptions accessors={true} />
 </>);
-return { props: {foo: foo , bar: bar}, slots: {}, getters: {foo: foo, bar: bar}, setters: {foo: foo}, events: {} }}
+return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-    get foo() { return render().getters.foo }
     get bar() { return render().getters.bar }
+    get foo() { return render().props.foo }
     /**accessor*/
-    set foo(foo) {}
+    set foo(_) {}
+    get foo2() { return render().props.foo2 }
+    /**accessor*/
+    set foo2(_) {}
+    get class() { return render().props.class }
+    /**accessor*/
+    set class(_) {}
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/input.svelte
index 711ad6285..20836d37c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/input.svelte
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/input.svelte
@@ -1,5 +1,8 @@
 <svelte:options accessors={true} />
 <script lang="ts">
 	export let foo: number = undefined
+	export let foo2 = undefined
+	let clazz: string
+	export { clazz as class }
 	export const bar: string = ''
 </script>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected.tsx
index f184b039f..ce8194714 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected.tsx
@@ -5,7 +5,7 @@
 	 const bar: string = ''
 ;
 () => (<></>);
-return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, setters: {}, events: {} }}
+return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
     get bar() { return render().getters.bar }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected.tsx
index a31d9340f..5f6c5df29 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected.tsx
@@ -8,7 +8,7 @@
 <sveltecomponent this={testComponent} >{() => { let {prop} = __sveltets_instanceOf(__sveltets_componentType()).$$slot_def['default'];<>
     <slot prop={prop} />
 </>}}</sveltecomponent></>
-return { props: {}, slots: {'default': {prop:__sveltets_instanceOf(__sveltets_componentType()).$$slot_def['default'].prop}}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {'default': {prop:__sveltets_instanceOf(__sveltets_componentType()).$$slot_def['default'].prop}}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
 }
\ No newline at end of file
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 a16d0dcab..53f093a09 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
@@ -13,7 +13,7 @@
 </sveltehead>
 <svelteoptions />
 <sveltefragment /></>
-return { props: {}, slots: {}, getters: {}, setters: {}, events: {} }}
+return { props: {}, slots: {}, getters: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
-}
+}
\ No newline at end of file