diff --git a/packages/language-server/package.json b/packages/language-server/package.json
index a6dedc6c8..d6415753e 100644
--- a/packages/language-server/package.json
+++ b/packages/language-server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "svelte-language-server",
-    "version": "0.13.0",
+    "version": "0.14.0",
     "description": "A language server for Svelte",
     "main": "dist/src/index.js",
     "typings": "dist/src/index",
@@ -58,7 +58,7 @@
         "source-map": "^0.7.3",
         "svelte": "~3.38.2",
         "svelte-preprocess": "~4.7.3",
-        "svelte2tsx": "~0.1.0",
+        "svelte2tsx": "~0.2.0",
         "typescript": "*",
         "vscode-css-languageservice": "5.0.0",
         "vscode-emmet-helper": "2.1.2",
diff --git a/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts b/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
index f4b7c8aee..b8762d880 100644
--- a/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
+++ b/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
@@ -76,7 +76,6 @@ export interface SnapshotFragment extends DocumentMapper {
  * Options that apply to svelte files.
  */
 export interface SvelteSnapshotOptions {
-    strictMode: boolean;
     transformOnTemplateError: boolean;
 }
 
@@ -173,7 +172,6 @@ function preprocessSvelteFile(document: Document, options: SvelteSnapshotOptions
 
     try {
         const tsx = svelte2tsx(text, {
-            strictMode: options.strictMode,
             filename: document.getFilePath() ?? undefined,
             isTsFile: scriptKind === ts.ScriptKind.TSX,
             emitOnTemplateError: options.transformOnTemplateError,
diff --git a/packages/language-server/src/plugins/typescript/service.ts b/packages/language-server/src/plugins/typescript/service.ts
index 117c1e03f..122c97641 100644
--- a/packages/language-server/src/plugins/typescript/service.ts
+++ b/packages/language-server/src/plugins/typescript/service.ts
@@ -132,7 +132,6 @@ async function createLanguageService(
     };
     let languageService = ts.createLanguageService(host);
     const transformationConfig = {
-        strictMode: !!compilerOptions.strict,
         transformOnTemplateError: docContext.transformOnTemplateError
     };
 
diff --git a/packages/language-server/test/plugins/typescript/features/DiagnosticsProvider.test.ts b/packages/language-server/test/plugins/typescript/features/DiagnosticsProvider.test.ts
index 10b738d57..da20233a2 100644
--- a/packages/language-server/test/plugins/typescript/features/DiagnosticsProvider.test.ts
+++ b/packages/language-server/test/plugins/typescript/features/DiagnosticsProvider.test.ts
@@ -961,4 +961,208 @@ describe('DiagnosticsProvider', () => {
         const diagnostics3 = await plugin.getDiagnostics(document);
         assert.deepStrictEqual(diagnostics3.length, 1);
     }).timeout(5000);
+
+    function assertPropsDiagnosticsStrict(diagnostics: any[], source: 'ts' | 'js') {
+        assert.deepStrictEqual(
+            diagnostics.map((d: any) => {
+                // irrelevant for this test, save some lines
+                delete d.range;
+                return d;
+            }),
+            [
+                {
+                    code: 2322,
+                    message:
+                        // eslint-disable-next-line max-len
+                        "Type '{}' is not assignable to type 'IntrinsicAttributes & { required: string; optional1?: string | undefined; optional2?: string | undefined; }'.\n  Property 'required' is missing in type '{}' but required in type '{ required: string; optional1?: string | undefined; optional2?: string | undefined; }'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'undefined' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message:
+                        // eslint-disable-next-line max-len
+                        "Type '{ required: string; optional1: string; optional2: string; doesntExist: boolean; }' is not assignable to type 'IntrinsicAttributes & { required: string; optional1?: string | undefined; optional2?: string | undefined; }'.\n  Property 'doesntExist' does not exist on type 'IntrinsicAttributes & { required: string; optional1?: string | undefined; optional2?: string | undefined; }'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'boolean' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'true' is not assignable to type 'string | undefined'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'true' is not assignable to type 'string | undefined'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message:
+                        // eslint-disable-next-line max-len
+                        "Type '{}' is not assignable to type 'IntrinsicAttributes & { required: string; optional1?: string | undefined; optional2?: string | undefined; }'.\n  Property 'required' is missing in type '{}' but required in type '{ required: string; optional1?: string | undefined; optional2?: string | undefined; }'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'undefined' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'boolean' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'true' is not assignable to type 'string | undefined'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'true' is not assignable to type 'string | undefined'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                }
+            ]
+        );
+    }
+
+    it('checks prop types correctly (ts file, strict mode)', async () => {
+        const { plugin, document } = setup(path.join('checkJs', 'props_importer-ts.svelte'));
+        const diagnostics = await plugin.getDiagnostics(document);
+        assertPropsDiagnosticsStrict(diagnostics, 'ts');
+    });
+
+    it('checks prop types correctly (js file, strict mode)', async () => {
+        const { plugin, document } = setup(path.join('checkJs', 'props_importer-js.svelte'));
+        const diagnostics = await plugin.getDiagnostics(document);
+        assertPropsDiagnosticsStrict(diagnostics, 'js');
+    });
+
+    function assertPropsDiagnostics(diagnostics: any[], source: 'ts' | 'js') {
+        assert.deepStrictEqual(
+            diagnostics.map((d: any) => {
+                // irrelevant for this test, save some lines
+                delete d.range;
+                return d;
+            }),
+            [
+                {
+                    code: 2322,
+                    message:
+                        // eslint-disable-next-line max-len
+                        "Type '{}' is not assignable to type 'IntrinsicAttributes & { required: string; optional1?: string; optional2?: string; }'.\n  Property 'required' is missing in type '{}' but required in type '{ required: string; optional1?: string; optional2?: string; }'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message:
+                        // eslint-disable-next-line max-len
+                        "Type '{ required: string; optional1: string; optional2: string; doesntExist: boolean; }' is not assignable to type 'IntrinsicAttributes & { required: string; optional1?: string; optional2?: string; }'.\n  Property 'doesntExist' does not exist on type 'IntrinsicAttributes & { required: string; optional1?: string; optional2?: string; }'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'boolean' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'boolean' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'boolean' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message:
+                        // eslint-disable-next-line max-len
+                        "Type '{}' is not assignable to type 'IntrinsicAttributes & { required: string; optional1?: string; optional2?: string; }'.\n  Property 'required' is missing in type '{}' but required in type '{ required: string; optional1?: string; optional2?: string; }'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'boolean' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'boolean' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                },
+                {
+                    code: 2322,
+                    message: "Type 'boolean' is not assignable to type 'string'.",
+                    severity: 1,
+                    source,
+                    tags: []
+                }
+            ]
+        );
+    }
+
+    it('checks prop types correctly (ts file, no strict mode)', async () => {
+        const { plugin, document } = setup(
+            path.join('checkJs-no-strict', 'props_importer-ts.svelte')
+        );
+        const diagnostics = await plugin.getDiagnostics(document);
+        assertPropsDiagnostics(diagnostics, 'ts');
+    });
+
+    it('checks prop types correctly (js file, no strict mode)', async () => {
+        const { plugin, document } = setup(
+            path.join('checkJs-no-strict', 'props_importer-js.svelte')
+        );
+        const diagnostics = await plugin.getDiagnostics(document);
+        assertPropsDiagnostics(diagnostics, 'js');
+    });
 });
diff --git a/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/props_importer-js.svelte b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/props_importer-js.svelte
new file mode 100644
index 000000000..6abcd64c8
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/props_importer-js.svelte
@@ -0,0 +1,21 @@
+<script>
+    import ImportTs from '../props_to-import-ts.svelte';
+    import ImportJs from '../props_to-import-js.svelte';
+</script>
+
+<!-- errors: -->
+<ImportTs />
+<ImportTs required={'a'} optional1={'b'} optional2={'c'} doesntExist={true} />
+<ImportTs required={true} optional1={true} optional2={true} />
+<ImportJs />
+<ImportJs required={true} optional1={true} optional2={true} />
+
+<!-- valid: -->
+<ImportTs required={'a'} />
+<ImportTs required={undefined} />
+<ImportTs required={'a'} optional1={'b'} optional2={'c'} />
+<ImportTs required={'a'} optional1={'b'} optional2={undefined} />
+<ImportJs required={'a'} />
+<ImportJs required={undefined} />
+<ImportJs required={'a'} optional1={'b'} optional2={'c'} />
+<ImportJs required={'a'} optional1={'b'} optional2={undefined} />
diff --git a/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/props_importer-ts.svelte b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/props_importer-ts.svelte
new file mode 100644
index 000000000..2493e9c55
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/props_importer-ts.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+    import ImportTs from '../props_to-import-ts.svelte';
+    import ImportJs from '../props_to-import-js.svelte';
+</script>
+
+<!-- errors: -->
+<ImportTs />
+<ImportTs required={'a'} optional1={'b'} optional2={'c'} doesntExist={true} />
+<ImportTs required={true} optional1={true} optional2={true} />
+<ImportJs />
+<ImportJs required={true} optional1={true} optional2={true} />
+
+<!-- valid: -->
+<ImportTs required={'a'} />
+<ImportTs required={undefined} />
+<ImportTs required={'a'} optional1={'b'} optional2={'c'} />
+<ImportTs required={'a'} optional1={'b'} optional2={undefined} />
+<ImportJs required={'a'} />
+<ImportJs required={undefined} />
+<ImportJs required={'a'} optional1={'b'} optional2={'c'} />
+<ImportJs required={'a'} optional1={'b'} optional2={undefined} />
diff --git a/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/tsconfig.json b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/tsconfig.json
new file mode 100644
index 000000000..2217f0b5c
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs-no-strict/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "compilerOptions": {
+        "checkJs": true,
+        /**
+          This is actually not needed, but makes the tests faster
+          because TS does not look up other types.
+        */
+        "types": ["svelte"]
+    }
+}
diff --git a/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/props_importer-js.svelte b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/props_importer-js.svelte
new file mode 100644
index 000000000..9d44b4e66
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/props_importer-js.svelte
@@ -0,0 +1,21 @@
+<script>
+    import ImportTs from '../props_to-import-ts.svelte';
+    import ImportJs from '../props_to-import-js.svelte';
+</script>
+
+<!-- errors: -->
+<ImportTs />
+<ImportTs required={undefined} />
+<ImportTs required={'a'} optional1={'b'} optional2={'c'} doesntExist={true} />
+<ImportTs required={true} optional1={true} optional2={true} />
+<ImportJs />
+<ImportJs required={undefined} />
+<ImportJs required={true} optional1={true} optional2={true} />
+
+<!-- valid: -->
+<ImportTs required={'a'} />
+<ImportTs required={'a'} optional1={'b'} optional2={'c'} />
+<ImportTs required={'a'} optional1={'b'} optional2={undefined} />
+<ImportJs required={'a'} />
+<ImportJs required={'a'} optional1={'b'} optional2={'c'} />
+<ImportJs required={'a'} optional1={'b'} optional2={undefined} />
diff --git a/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/props_importer-ts.svelte b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/props_importer-ts.svelte
new file mode 100644
index 000000000..2df40c351
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/props_importer-ts.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+    import ImportTs from '../props_to-import-ts.svelte';
+    import ImportJs from '../props_to-import-js.svelte';
+</script>
+
+<!-- errors: -->
+<ImportTs />
+<ImportTs required={undefined} />
+<ImportTs required={'a'} optional1={'b'} optional2={'c'} doesntExist={true} />
+<ImportTs required={true} optional1={true} optional2={true} />
+<ImportJs />
+<ImportJs required={undefined} />
+<ImportJs required={true} optional1={true} optional2={true} />
+
+<!-- valid: -->
+<ImportTs required={'a'} />
+<ImportTs required={'a'} optional1={'b'} optional2={'c'} />
+<ImportTs required={'a'} optional1={'b'} optional2={undefined} />
+<ImportJs required={'a'} />
+<ImportJs required={'a'} optional1={'b'} optional2={'c'} />
+<ImportJs required={'a'} optional1={'b'} optional2={undefined} />
diff --git a/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/tsconfig.json b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/tsconfig.json
new file mode 100644
index 000000000..fced420d1
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/checkJs/tsconfig.json
@@ -0,0 +1,11 @@
+{
+    "compilerOptions": {
+        "strict": true,
+        "checkJs": true,
+        /**
+          This is actually not needed, but makes the tests faster
+          because TS does not look up other types.
+        */
+        "types": ["svelte"]
+    }
+}
diff --git a/packages/language-server/test/plugins/typescript/testfiles/diagnostics/props_to-import-js.svelte b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/props_to-import-js.svelte
new file mode 100644
index 000000000..e1917aa2b
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/props_to-import-js.svelte
@@ -0,0 +1,11 @@
+<script>
+  /**
+   * @type {string}
+   */
+  export let required;
+  export let optional1 = '';
+  /**
+   * @type {string | undefined}
+   */
+  export let optional2 = undefined;
+</script>
diff --git a/packages/language-server/test/plugins/typescript/testfiles/diagnostics/props_to-import-ts.svelte b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/props_to-import-ts.svelte
new file mode 100644
index 000000000..4a14322c2
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/diagnostics/props_to-import-ts.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+    export let required: string;
+    export let optional1 = '';
+    export let optional2: string | undefined = undefined;
+</script>
diff --git a/packages/svelte2tsx/index.d.ts b/packages/svelte2tsx/index.d.ts
index 68a9f0cd6..eb01dbe5e 100644
--- a/packages/svelte2tsx/index.d.ts
+++ b/packages/svelte2tsx/index.d.ts
@@ -20,10 +20,6 @@ export default function svelte2tsx(
          * Path of the file
          */
         filename?: string;
-        /**
-         * Whether or not TS strictMode is enabled
-         */
-        strictMode?: boolean;
         /**
          * If the given file uses TypeScript inside script.
          * This cannot be inferred from `svelte2tsx` by looking
diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index 639991891..3bc83cdb1 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -1,6 +1,6 @@
 {
     "name": "svelte2tsx",
-    "version": "0.1.4",
+    "version": "0.2.0",
     "description": "Convert Svelte components to TSX for type checking",
     "author": "David Pershouse",
     "license": "MIT",
diff --git a/packages/svelte2tsx/src/svelte2tsx/index.ts b/packages/svelte2tsx/src/svelte2tsx/index.ts
index 0f97fed54..a25ff3a43 100644
--- a/packages/svelte2tsx/src/svelte2tsx/index.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/index.ts
@@ -38,7 +38,6 @@ interface CreateRenderFunctionPara extends InstanceScriptProcessResult {
 interface AddComponentExportPara {
     str: MagicString;
     uses$$propsOr$$restProps: boolean;
-    strictMode: boolean;
     /**
      * If true, not fallback to `any`
      * -> all unknown events will throw a type error
@@ -315,7 +314,6 @@ function processSvelteTemplate(
 function addComponentExport({
     str,
     uses$$propsOr$$restProps,
-    strictMode,
     strictEvents,
     isTsFile,
     getters,
@@ -324,18 +322,18 @@ function addComponentExport({
     fileName,
     componentDocumentation
 }: AddComponentExportPara) {
-    const eventsDef = strictEvents ? 'render' : '__sveltets_with_any_event(render)';
-    const propDef =
-        // Omit partial-wrapper only if both strict mode and ts file, because
-        // in a js file the user has no way of telling the language that
-        // the prop is optional
-        strictMode && isTsFile
-            ? uses$$propsOr$$restProps
-                ? `__sveltets_with_any(${eventsDef})`
-                : eventsDef
-            : `__sveltets_partial${isTsFile ? '_ts' : ''}${
-                  uses$$propsOr$$restProps ? '_with_any' : ''
-              }(${eventsDef})`;
+    const eventsDef = strictEvents ? 'render()' : '__sveltets_with_any_event(render())';
+    let propDef = '';
+    if (isTsFile) {
+        propDef = uses$$propsOr$$restProps ? `__sveltets_with_any(${eventsDef})` : eventsDef;
+    } else {
+        const optionalProps = exportedNames.createOptionalPropsArray();
+        const partial = `__sveltets_partial${uses$$propsOr$$restProps ? '_with_any' : ''}`;
+        propDef =
+            optionalProps.length > 0
+                ? `${partial}([${optionalProps.join(',')}], ${eventsDef})`
+                : `${partial}(${eventsDef})`;
+    }
 
     const doc = componentDocumentation.getFormatted();
     const className = fileName && classNameFromFilename(fileName);
@@ -457,7 +455,6 @@ export function svelte2tsx(
     svelte: string,
     options?: {
         filename?: string;
-        strictMode?: boolean;
         isTsFile?: boolean;
         emitOnTemplateError?: boolean;
         namespace?: string;
@@ -542,7 +539,6 @@ export function svelte2tsx(
     addComponentExport({
         str,
         uses$$propsOr$$restProps: uses$$props || uses$$restProps,
-        strictMode: !!options?.strictMode,
         strictEvents: events.hasInterface(),
         isTsFile: options?.isTsFile,
         getters,
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
index 77691d61b..005f2e7a3 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
@@ -95,4 +95,10 @@ export class ExportedNames
 
         return `{${returnElements.join(' , ')}} as {${returnElementsType.join(', ')}}`;
     }
+
+    createOptionalPropsArray() {
+        return Array.from(this.entries())
+            .filter(([_, entry]) => !entry.required)
+            .map(([name, entry]) => `'${entry.identifierText || name}'`);
+    }
 }
diff --git a/packages/svelte2tsx/svelte-shims.d.ts b/packages/svelte2tsx/svelte-shims.d.ts
index 3186a3a6b..6b0af8227 100644
--- a/packages/svelte2tsx/svelte-shims.d.ts
+++ b/packages/svelte2tsx/svelte-shims.d.ts
@@ -90,12 +90,16 @@ type SvelteAnimationReturnType = {
     tick?: (t: number, u: number) => void
 }
 
+type SvelteWithOptionalProps<Props, Keys extends keyof Props> = Omit<Props, Keys> & Partial<Pick<Props, Keys>>;
 type SvelteAllProps = { [index: string]: any }
 type SveltePropsAnyFallback<Props> = {[K in keyof Props]: Props[K] extends undefined ? any : Props[K]}
 type SvelteRestProps = { [index: string]: any }
 type SvelteSlots = { [index: string]: any }
 type SvelteStore<T> = { subscribe: (run: (value: T) => any, invalidate?: any) => any }
 
+// Forces TypeScript to look into the type which results in a better representation of it
+// which helps for error messages
+type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
 
 declare var process: NodeJS.Process & { browser: boolean }
 declare var __sveltets_AnimationMove: { from: DOMRect, to: DOMRect }
@@ -111,24 +115,36 @@ declare function __sveltets_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
 declare function __sveltets_allPropsType(): SvelteAllProps
 declare function __sveltets_restPropsType(): SvelteRestProps
 declare function __sveltets_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
+
+// Overload of the following two functions is necessary.
+// An empty array of optionalProps makes OptionalProps type any, which means we lose the prop typing.
+// optionalProps need to be first or its type cannot be infered correctly.
+
 declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}>(
-    render: () => {props?: Props, events?: Events, slots?: Slots }
-): () => {props?: Partial<SveltePropsAnyFallback<Props>>, events?: Events, slots?: Slots }
+    render: {props?: Props, events?: Events, slots?: Slots }
+): {props?: SveltePropsAnyFallback<Props>, events?: Events, slots?: Slots }
+declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+    optionalProps: OptionalProps[],
+    render: {props?: Props, events?: Events, slots?: Slots }
+): {props?: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>>, events?: Events, slots?: Slots }
+
 declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}>(
-    render: () => {props?: Props, events?: Events, slots?: Slots }
-): () => {props?: Partial<SveltePropsAnyFallback<Props>> & SvelteAllProps, events?: Events, slots?: Slots }
-declare function __sveltets_partial_ts<Props = {}, Events = {}, Slots = {}>(
-    render: () => {props?: Props, events?: Events, slots?: Slots }
-): () => {props?: Partial<Props>, events?: Events, slots?: Slots }
-declare function __sveltets_partial_ts_with_any<Props = {}, Events = {}, Slots = {}>(
-    render: () => {props?: Props, events?: Events, slots?: Slots }
-): () => {props?: Partial<Props> & SvelteAllProps, events?: Events, slots?: Slots }
+    render: {props?: Props, events?: Events, slots?: Slots }
+): {props?: SveltePropsAnyFallback<Props> & SvelteAllProps, events?: Events, slots?: Slots }
+declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+    optionalProps: OptionalProps[],
+    render: {props?: Props, events?: Events, slots?: Slots }
+): {props?: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>> & SvelteAllProps, events?: Events, slots?: Slots }
+
+
 declare function __sveltets_with_any<Props = {}, Events = {}, Slots = {}>(
-    render: () => {props?: Props, events?: Events, slots?: Slots }
-): () => {props?: Props & SvelteAllProps, events?: Events, slots?: Slots }
+    render: {props?: Props, events?: Events, slots?: Slots }
+): {props?: Props & SvelteAllProps, events?: Events, slots?: Slots }
+
 declare function __sveltets_with_any_event<Props = {}, Events = {}, Slots = {}>(
-    render: () => {props?: Props, events?: Events, slots?: Slots }
-): () => {props?: Props, events?: Events & {[evt: string]: CustomEvent<any>;}, slots?: Slots }
+    render: {props?: Props, events?: Events, slots?: Slots }
+): {props?: Props, events?: Events & {[evt: string]: CustomEvent<any>;}, slots?: Slots }
+
 declare function __sveltets_store_get<T = any>(store: SvelteStore<T>): T
 declare function __sveltets_any(dummy: any): any;
 declare function __sveltets_empty(dummy: any): {};
@@ -181,7 +197,7 @@ declare function __sveltets_each<T>(
 ): any;
 
 declare function createSvelte2TsxComponent<Props, Events, Slots>(
-    render: () => {props?: Props, events?: Events, slots?: Slots }
+    render: {props?: Props, events?: Events, slots?: Slots }
 ): SvelteComponentConstructor<Svelte2TsxComponent<Props, Events, Slots>,Svelte2TsxComponentConstructorParameters<Props>>;
 
 declare function __sveltets_unwrapArr<T>(arr: ArrayLike<T>): T
diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 464d91cd9..7f7b083c8 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -306,7 +306,6 @@ export function get_svelte2tsx_config(base: BaseConfig, sampleName: string): Sve
     return {
         filename: base.filename,
         emitOnTemplateError: base.emitOnTemplateError,
-        strictMode: sampleName.includes('strictMode'),
         isTsFile: sampleName.startsWith('ts-'),
         namespace: sampleName.endsWith('-foreign-ns') ? 'foreign' : null
     };
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx
index 21eb1b6bb..d79f836e7 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx
@@ -73,5 +73,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/await-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx
index 134cf6753..60fbd332a 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx
@@ -60,5 +60,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/component-props/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx
index c30c6bc81..793ff6099 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx
@@ -39,5 +39,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/each-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx
index a5c215fb2..02ddad215 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx
@@ -100,5 +100,5 @@
 </>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/element-attributes/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx
index 4e29270e4..fb47c67c7 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx
@@ -59,5 +59,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/event-binding/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx
index 1b608056b..3737fb835 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx
@@ -17,5 +17,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/if-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx
index 893914be8..a00c24fdf 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx
@@ -57,5 +57,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/large-sample-1/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/large-sample-1/mappings.jsx
index fa50c433c..91c76096d 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/large-sample-1/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/large-sample-1/mappings.jsx
@@ -470,5 +470,5 @@ s
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {slug: slug , chapter: chapter}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/let/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx
index fa1ec32d9..a6822847d 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx
@@ -26,5 +26,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/property-shorthand/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx
index 4b38fa160..38f9dbbb7 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx
@@ -9,5 +9,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/reactive-statements/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/mappings.jsx
index 5c60159bd..16ba096ac 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/mappings.jsx
@@ -48,5 +48,5 @@
 () => (<></>);
 return { props: {prop: prop}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/reserved-variables/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx
index 61d2cea23..c525e443f 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx
@@ -53,5 +53,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/simple-element/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx
index 6247d376c..cbc77a93e 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx
@@ -9,5 +9,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/sourcemaps/samples/slots/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx
index 4dabf4361..97ef481ca 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx
@@ -33,5 +33,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {'default': {}, 'foo': {}, 'bar': {foo:foo, baz:baz}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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-as-directive/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
index 9208f1ff9..f5b93643a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
@@ -19,5 +19,5 @@
 </div></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 952d7e61d..3aaf3b5e6 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
@@ -25,5 +25,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 d9ded12d6..2da0c576b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
@@ -5,5 +5,5 @@
 {someObject.$store}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 81fc133cb..02e20d83f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 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))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['a','b','c'], __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 a42d802b2..faa667e94 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
@@ -4,5 +4,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 9cc76869b..663798ed2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
@@ -4,5 +4,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/attributes-foreign-ns/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expected.tsx
index 793e8a3dd..ae559d034 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expected.tsx
@@ -4,5 +4,5 @@
 <Component someAttr="5" otherAttr={6} /></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 83037d66e..87b853e41 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
@@ -15,5 +15,5 @@ function render() {
 </>})}}</>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 e94180488..3ccb55782 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
@@ -3,5 +3,5 @@
 <><input id="dom-input" type="radio" {...__sveltets_empty((__sveltets_store_get(compile_options), $compile_options).generate)} value="dom"/></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 6430a0658..6e5de3722 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
@@ -90,5 +90,5 @@
 </> : <></>}</>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 db2c8744a..10e8f1614 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx
@@ -8,5 +8,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 934f5399f..895d9c458 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
@@ -9,5 +9,5 @@
 </div></>);
 return { props: {}, slots: {'default': {a:b}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 a38908b16..80037c2b2 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
@@ -15,5 +15,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} as unknown as ComponentEvents }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
+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 6845dc046..9ae3ad44e 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
@@ -13,5 +13,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} as unknown as ComponentEvents }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
+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 80f502100..d2accbc94 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx
@@ -13,5 +13,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} as unknown as ComponentEvents }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {
+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 e138e7aff..b11d718de 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
@@ -13,5 +13,5 @@
 </div></>);
 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))) {
+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 e3f4382ca..b5e896560 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
@@ -9,5 +9,5 @@
 </div></>);
 return { props: {}, slots: {'default': {a:b, b:b, c:"b", d:"__svelte_ts_string", e:b}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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-forward-with-props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected.tsx
index 68d41f4bf..b0d280206 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected.tsx
@@ -5,5 +5,5 @@
 </>}}</Parent></>
 return { props: {}, slots: {'default': {foo:__sveltets_instanceOf(Parent).$$slot_def['default'].foo}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 bbc37eb4e..5e279cf4d 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
@@ -10,5 +10,5 @@
 </>})}}</>
 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))) {
+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 0cc4ec2ea..4cc47b6fd 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
@@ -8,5 +8,5 @@
 </>)}</>
 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))) {
+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 7c6613577..60905548c 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
@@ -7,5 +7,5 @@
 </Component></>
 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))) {
+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 f18e90ffc..f3fadf13e 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
@@ -5,5 +5,5 @@
 </>}}</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: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 a6b5bc712..555711745 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
@@ -13,5 +13,5 @@
 <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: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 593560273..b377fade2 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
@@ -10,5 +10,5 @@ function render() {
 <div><Test >{() => { let {t} = /*Ωignore_startΩ*/new Test({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>xx</>}}</Test></div></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 82a58df00..d144f4495 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
@@ -5,5 +5,5 @@
 </>)}</>
 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))) {
+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 a4fe90f5b..b2313bda5 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
@@ -5,5 +5,5 @@
 </>)}</>
 return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items)}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 2773d050b..94d777c21 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
@@ -6,5 +6,5 @@
 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))) {
+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 80f2da819..ad1806ca2 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
@@ -18,5 +18,5 @@ return { props: {}, slots: {}, getters: {}, events: {} }}
  *
  * The output should be indented properly!
  */
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 1a682f50a..5c29c0ba7 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
@@ -12,5 +12,5 @@ return { props: {}, slots: {}, getters: {}, events: {} }}
  * type Type = 'type'
  * ```
  */
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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/custom-css-properties-with-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expected.tsx
index c6d3e11fa..ae5f92221 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expected.tsx
@@ -7,5 +7,5 @@
   {...__sveltets_cssProp({"--custom-css-property4": `hi${(__sveltets_store_get(jo), $jo)}hi`})} /></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 12c868806..d3ffce7a2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx
@@ -5,5 +5,5 @@
 {myfile}{(__sveltets_store_get(someOtherFile), $someOtherFile)}{someThirdFile}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 84e218959..9d535785c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx
@@ -3,5 +3,5 @@
 <>{a?.}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 0514ab40f..94ffa5d9c 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
@@ -13,5 +13,5 @@ function render() {
 <input onfocus={undefined} /></>);
 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))) {
+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 bd27eda3d..2676b1409 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
@@ -4,5 +4,5 @@
 <Radio ></Radio></>
 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))) {
+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-with-props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expected.tsx
index 49fe8468d..460fe9e7b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expected.tsx
@@ -3,5 +3,5 @@
 <><Component propA propB={propB} propC="val1" propD="val2" propE={`a${a}b${b}`}  /></>
 return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_bubbleEventDef(__sveltets_instanceOf(Component).$$events_def, 'click')} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 d1ef6f145..ae3b900f8 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
@@ -3,5 +3,5 @@
 <><Button ></Button></>
 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))) {
+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 85c8f2af7..a52dc18a9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
@@ -3,5 +3,5 @@
 <><button onclick={undefined}></button></>
 return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapElementEvent('click')} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 0789be865..7f826d2b7 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
@@ -4,5 +4,5 @@
 <sveltewindow onresize={undefined}></sveltewindow></>
 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))) {
+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 007d13e14..910b6e8fb 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
@@ -20,5 +20,5 @@ function render() {
 <button onclick={() => dispatch('btn', '')}></button></>);
 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))) {
+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 9ab7257f0..001e9647a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx
@@ -20,5 +20,5 @@ function render() {
 <button onclick={() => dispatch('btn', '')}></button></>);
 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))) {
+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-dispatchers/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatchers/expected.tsx
index 8313f1340..d6825ad08 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatchers/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatchers/expected.tsx
@@ -17,5 +17,5 @@ function render() {
 <button onclick={undefined}></button></>);
 return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapElementEvent('click'), 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 6ed69c5d9..4b598ca9f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
@@ -6,6 +6,6 @@
 () => (<></>);
 return { props: {Foo: Foo}, slots: {}, getters: {Foo: Foo}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['Foo'], __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 bb65f39b4..caf578dcb 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
@@ -23,5 +23,5 @@ return { props: {
      * MORE DOCS!
      */b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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-required-props/expected.tsx
similarity index 76%
rename from packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/expected.tsx
rename to packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/expected.tsx
index 547be7c31..6b18c86ec 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/expected.tsx
@@ -8,5 +8,5 @@
 () => (<></>);
 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))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['c'], __sveltets_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/input.svelte
similarity index 100%
rename from packages/svelte2tsx/test/svelte2tsx/samples/export-js-strictMode/input.svelte
rename to packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/input.svelte
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
index cc7e3d9cc..9d0c2abc1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
@@ -8,5 +8,5 @@
 () => (<></>);
 return { props: {name: name , name2: name2}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name','name2'], __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 a4019b038..0e802a6ae 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
@@ -7,5 +7,5 @@
 () => (<></>);
 return { props: {name: name}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name'], __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 00f3d80a1..46e694b5a 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
@@ -10,5 +10,5 @@ return { props: {
 /**@type { string | number }*/name: name , 
 /**@type { string | number }*/world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name','world'], __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 a69c9661f..0c20ab1b5 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
@@ -3,5 +3,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class AslugTestUpperUpper3asd4__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 4694e5969..6e245727f 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
@@ -3,5 +3,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class A0__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 609006d94..ec5d77a47 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
@@ -9,5 +9,5 @@ function render() {
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 9929f3ebf..d9f5959ff 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
@@ -13,5 +13,5 @@ function render() {
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __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 06f2e12f7..9fbc5a5a4 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
@@ -4,5 +4,5 @@
 () => (<><h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __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 06f2e12f7..9fbc5a5a4 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
@@ -4,5 +4,5 @@
 () => (<><h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __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 c5264bde7..7f1760387 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
@@ -11,5 +11,5 @@
 <h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __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 83f5a7ebd..804312c04 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
@@ -11,5 +11,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __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 a6aebe50c..038cb9056 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
@@ -25,5 +25,5 @@ const test4 = ({a,  b: { $top1: $top2 }}) => $top2 && (__sveltets_store_get(top1
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 aae0984d7..d86fd7d89 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
@@ -27,5 +27,5 @@
 }}>Hi</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 543fbc97e..7265f165c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {rename: rename}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['rename'], __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 f301ffc62..0f70ca11a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx
@@ -20,5 +20,5 @@ $: ([ bla4, bla5 ] = __sveltets_invalidate(() => (__sveltets_store_get(data), $d
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 c352b87cf..f5423debb 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
@@ -9,5 +9,5 @@ let a: 1 | 2 = 1;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 d26b32fdd..7293626da 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 84de7ae23..09b9c38e9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
@@ -7,5 +7,5 @@ let  b = __sveltets_invalidate(() => ({ a: 1 }));
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 8e9f52da2..6e8bf68aa 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
@@ -12,5 +12,5 @@ $: a = __sveltets_invalidate(() => 5);
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 00ff97091..5746c1eda 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
@@ -10,5 +10,5 @@ $: a = __sveltets_invalidate(() => 5);
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 140603366..3e664de1b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 842668b96..60494d96f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
@@ -8,5 +8,5 @@
 () => (<></>);
 return { props: {name3: name , name4: name2}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name3','name4'], __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 8c892208b..dc6922353 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
@@ -11,5 +11,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __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 a61eeb412..f35be9078 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
@@ -15,5 +15,5 @@
 </sveltehead></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 da455257a..6fa60cd0c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
@@ -7,5 +7,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __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 2f18efe6c..c4bb7de1a 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
@@ -11,5 +11,5 @@
 <Style /></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 77729aa4c..7d9344e6e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
@@ -10,5 +10,5 @@ let a = 'b';
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 ca20e0684..218b65ed1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
@@ -3,5 +3,5 @@
 <><h1>hello</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 c68182653..e6f98d2e1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {name: name}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name'], __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 830f1c5c0..cb9085153 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx
@@ -3,5 +3,5 @@
 <><slot name="s" {...__sveltets_ensureType(HTMLSlotElement, s)} /></>
 return { props: {}, slots: {'s': {}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 48a5e62ed..86fcccbb4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx
@@ -13,5 +13,5 @@
 <p>{(__sveltets_store_get(store4), $store4)}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 81360a395..5a16af855 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx
@@ -16,5 +16,5 @@
 <p>{(__sveltets_store_get(store4), $store4)}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 e26ad8065..709d776c8 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
@@ -11,5 +11,5 @@
 <p>{(__sveltets_store_get(store2), $store2)}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 680fbbe20..6bc41ab7d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx
@@ -16,5 +16,5 @@ function render() {
 <p>{(__sveltets_store_get(storeC), $storeC)}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 90e6e41ca..c72ae2d68 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx
@@ -24,5 +24,5 @@
 <p>{(__sveltets_store_get(store), $store)?.prop?.anotherProp}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 2ef201bfe..1227fed30 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
@@ -3,5 +3,5 @@
 <><Me f={`${(__sveltets_store_get(s), $s)} `}/></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 c965763d1..8d7284c13 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
@@ -4,5 +4,5 @@
 </>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 b62ad4be3..c9fdb4ae5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
@@ -6,5 +6,5 @@
 {true === true}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 e7d8d4fe0..c04e6b46e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
@@ -3,5 +3,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 e7d8d4fe0..c04e6b46e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
@@ -3,5 +3,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 be079bd09..66e4eb746 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
@@ -46,5 +46,5 @@ return { props: {}, slots: {}, getters: {}, events: {...__sveltets_toEventTyping
     // not this
     btn: string;}>()} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
+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-event-dispatchers-same-event/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expected.tsx
index 8de728584..f4ef13645 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expected.tsx
@@ -27,5 +27,5 @@ return { props: {}, slots: {}, getters: {}, events: {...__sveltets_toEventTyping
     hi: boolean;
     }>(), ...__sveltets_toEventTypings<{hi: string;}>(), 'click':__sveltets_mapElementEvent('click'), 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
+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-event-dispatchers/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expected.tsx
index e6c13a989..384288ced 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expected.tsx
@@ -27,5 +27,5 @@ return { props: {}, slots: {}, getters: {}, events: {...__sveltets_toEventTyping
     hi: boolean;
     }>(), ...__sveltets_toEventTypings<{btn: string;}>(), 'click':__sveltets_mapElementEvent('click'), 'bye': __sveltets_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
+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-export-arrow-function/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx
index 08dfcf9a9..c4c79b505 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
@@ -9,5 +9,5 @@
 () => (<></>);
 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))) {
+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-export-boolean/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
index d75d7c8be..681c54dd1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
@@ -10,5 +10,5 @@
 () => (<></>);
 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))) {
+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-export-const/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
index b7550f665..7db5d492e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
@@ -7,7 +7,7 @@
 () => (<></>);
 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))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
     get name() { return render().getters.name }
     get SOME() { return render().getters.SOME }
     get CONSTANT() { return render().getters.CONSTANT }
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 629902bb3..49ed46137 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
@@ -18,5 +18,5 @@ return { props: {
      * 
      */a: a}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
+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-export-doc/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
index 11143ad5e..ece9532f8 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
@@ -23,5 +23,5 @@ return { props: {a: a , b: b , c: c , d: d} as {
      * MORE DOCS!
      */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))) {
+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-export-has-initializer/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx
index 7835fdc4b..236c7828d 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
@@ -6,5 +6,5 @@
 () => (<></>);
 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))) {
+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-export-has-type/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx
index f697b16fb..c517bbac4 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
@@ -8,5 +8,5 @@
 () => (<></>);
 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))) {
+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-export-interface/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
index 91a0d93bc..2fbee87f4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
@@ -5,5 +5,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
+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-export-strictMode/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expected.tsx
similarity index 87%
rename from packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/expected.tsx
rename to packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expected.tsx
index f485bffbc..9ba780031 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expected.tsx
@@ -8,5 +8,5 @@
 () => (<></>);
 return { props: {a: a , b: b , c: c} as {a: number, b: number | undefined, c?: number}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render)) {
+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-export-strictMode/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/input.svelte
similarity index 100%
rename from packages/svelte2tsx/test/svelte2tsx/samples/ts-export-strictMode/input.svelte
rename to packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/input.svelte
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 827a570c0..49b55a70e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
@@ -8,5 +8,5 @@
 <h1>{number1} + {number2} = {number1 + number2}</h1></>);
 return { props: {number1: number1 , number2: number2} as {number1: number, number2: number}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
+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-style-and-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx
index 02a2be799..ee34ed865 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
@@ -7,5 +7,5 @@
 </>);
 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))) {
+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-type-assertion/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
index e4e510d8f..d6d345fb9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
@@ -10,5 +10,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts(__sveltets_with_any_event(render))) {
+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-typed-export-with-default/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx
index dcda67e59..252b5cf2b 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
@@ -6,5 +6,5 @@
 () => (<></>);
 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))) {
+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-uses-$$props-strictMode/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props-strictMode/expected.tsx
deleted file mode 100644
index 4c053bf2d..000000000
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props-strictMode/expected.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-///<reference types="svelte" />
-<></>;function render() { let $$props = __sveltets_allPropsType();
- ;
-() => (<>
-<h1>{$$props['name']}</h1></>);
-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-strictMode/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props-strictMode/input.svelte
deleted file mode 100644
index a3ba4b3b2..000000000
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props-strictMode/input.svelte
+++ /dev/null
@@ -1,2 +0,0 @@
-<script lang="ts"> </script>
-<h1>{$$props['name']}</h1>
\ 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 8928b93d2..73088a8e2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx
@@ -5,5 +5,5 @@
 <h1>{$$props['name']}</h1></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_ts_with_any(__sveltets_with_any_event(render))) {
+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/typeof-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expected.tsx
index 6e406174a..8b4b87a95 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expected.tsx
@@ -10,5 +10,5 @@ function render() {
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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-$$props-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
index 69828236e..7a52b9ad9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
@@ -7,5 +7,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
+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 cdf104cb3..cf5887306 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
@@ -3,5 +3,5 @@
 <><h1>{$$props['name']}</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
+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 2244babe1..73f63ba45 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
@@ -7,5 +7,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
+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 12b9a7152..768c6c8bf 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
@@ -3,5 +3,5 @@
 <><h1>{$$restProps['name']}</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render))) {
+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 1573553c7..e251118e7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx
@@ -12,5 +12,5 @@
 <slot /></>);
 return { props: {}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 11be08ea7..63a8abe6c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx
@@ -8,5 +8,5 @@
 <slot /></>
 return { props: {}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 f98115f29..e704ae52e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx
@@ -14,5 +14,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 cd5dec7b4..4fbce8805 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
@@ -4,5 +4,5 @@
 <button onclick={(__sveltets_store_get(check), $check) ? method1 : method2} >Bla</button></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 e4fc30d92..5dc0f00df 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
@@ -20,5 +20,5 @@
 {(__sveltets_store_get(store10), $store10)}</>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 93d6abf3d..a774c5d47 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
@@ -35,5 +35,5 @@ function render() {
 <button onclick={() => count.set( $count | myvar)}>OR</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 7e2e72548..30b5f3753 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
@@ -12,5 +12,5 @@ function render() {
 <button onclick={() => !(__sveltets_store_get(count), $count)}>add</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 b5e3904c2..2b36f5e8c 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
@@ -15,5 +15,5 @@ function render() {
 <button onclick={() => count.set( $count + 1)}>add</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 88718d84d..1108438d7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
@@ -5,5 +5,5 @@ 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: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+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 5fcedfa9d..45dfe34f1 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
@@ -8,6 +8,6 @@
 </>);
 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))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','bar'], __sveltets_with_any_event(render()))) {
     get bar() { return render().getters.bar }
 }
\ No newline at end of file
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 919476fca..b2ce72bce 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
@@ -11,7 +11,7 @@
 </>);
 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))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','foo2','class','bar'], __sveltets_with_any_event(render()))) {
     get bar() { return render().getters.bar }
     get foo() { return render().props.foo }
     /**accessor*/
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 810fca3c7..d6949cf89 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
@@ -8,6 +8,6 @@
 </>);
 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))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','bar'], __sveltets_with_any_event(render()))) {
     get bar() { return render().getters.bar }
 }
\ No newline at end of file
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 83e4dedcc..b8d03c745 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
@@ -11,7 +11,7 @@
 </>);
 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))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','foo2','class','bar'], __sveltets_with_any_event(render()))) {
     get bar() { return render().getters.bar }
     get foo() { return render().props.foo }
     /**accessor*/
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 ce8194714..49f23517e 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
@@ -7,6 +7,6 @@
 () => (<></>);
 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))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','bar'], __sveltets_with_any_event(render()))) {
     get bar() { return render().getters.bar }
 }
\ No newline at end of file
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 5f6c5df29..eaffa4eff 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
@@ -10,5 +10,5 @@
 </>}}</sveltecomponent></>
 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))) {
+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 53f093a09..c07ee99ec 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
@@ -15,5 +15,5 @@
 <sveltefragment /></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render))) {
+export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
index 7139618a5..7e8cab695 100644
--- a/packages/typescript-plugin/package.json
+++ b/packages/typescript-plugin/package.json
@@ -23,7 +23,7 @@
         "typescript": "*"
     },
     "dependencies": {
-        "svelte2tsx": "*",
+        "svelte2tsx": "~0.2.0",
         "sourcemap-codec": "^1.4.8"
     }
 }
diff --git a/packages/typescript-plugin/src/index.ts b/packages/typescript-plugin/src/index.ts
index d0da77bc2..2d4fd4072 100644
--- a/packages/typescript-plugin/src/index.ts
+++ b/packages/typescript-plugin/src/index.ts
@@ -19,8 +19,7 @@ function init(modules: { typescript: typeof ts }) {
         const snapshotManager = new SvelteSnapshotManager(
             modules.typescript,
             info.project.projectService,
-            logger,
-            !!info.project.getCompilerOptions().strict
+            logger
         );
 
         patchCompilerOptions(info.project);
diff --git a/packages/typescript-plugin/src/svelte-snapshots.ts b/packages/typescript-plugin/src/svelte-snapshots.ts
index cf7c901da..cdf20bbbf 100644
--- a/packages/typescript-plugin/src/svelte-snapshots.ts
+++ b/packages/typescript-plugin/src/svelte-snapshots.ts
@@ -232,8 +232,7 @@ export class SvelteSnapshotManager {
     constructor(
         private typescript: typeof ts,
         private projectService: ts.server.ProjectService,
-        private logger: Logger,
-        private strictMode: boolean
+        private logger: Logger
     ) {
         this.patchProjectServiceReadFile();
     }
@@ -285,7 +284,6 @@ export class SvelteSnapshotManager {
                     const isTsFile = true; // TODO check file contents? TS might be okay with importing ts into js.
                     const result = svelte2tsx(svelteCode, {
                         filename: path.split('/').pop(),
-                        strictMode: this.strictMode,
                         isTsFile
                     });
                     const existingSnapshot = this.snapshots.get(path);