fix: snippet cleanup

dummdidumm · dummdidumm · commit a2f86e10e50e · 2023-11-29T09:53:53.000+01:00
- adjust snippet function to handle no params through function overload
- move top level snippets to start of instance script to prevent "cannot be used before declaration" errors
- append `;` to non-prop-snippets to ensure code afterwards is a new statement
- fix snippet prop for js version (`?` isn't valid there)
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/SnippetBlock.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/SnippetBlock.ts
@@ -30,16 +30,22 @@ export function handleSnippet(
     snippetBlock: BaseNode,
     component?: InlineComponent
 ): void {
+    const isImplicitProp = component !== undefined;
     const endSnippet = str.original.lastIndexOf('{', snippetBlock.end - 1);
     // Return something to silence the "snippet type not assignable to return type void" error
-    str.overwrite(endSnippet, snippetBlock.end, 'return __sveltets_2_any(0)}', {
-        contentOnly: true
-    });
+    str.overwrite(
+        endSnippet,
+        snippetBlock.end,
+        `return __sveltets_2_any(0)}${isImplicitProp ? '' : ';'}`,
+        {
+            contentOnly: true
+        }
+    );
 
     const startEnd =
         str.original.indexOf('}', snippetBlock.context?.end || snippetBlock.expression.end) + 1;
 
-    if (component !== undefined) {
+    if (isImplicitProp) {
         str.overwrite(snippetBlock.start, snippetBlock.expression.start, '', { contentOnly: true });
         const transforms: TransformationArray = ['('];
         if (snippetBlock.context) {
diff --git a/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts b/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts
@@ -74,11 +74,7 @@ export function createRenderFunction({
             }
             str.overwrite(scriptTag.start + 1, start - 1, `function render`);
             str.overwrite(start - 1, start, `<`); // if the generics are unused, only this char is colored opaque
-            if (end < scriptTagEnd) {
-                str.overwrite(end, scriptTagEnd, `>() {${propsDecl}\n`);
-            } else {
-                str.prependRight(end, `>() {${propsDecl}\n`);
-            }
+            str.overwrite(end, scriptTagEnd, `>() {${propsDecl}\n`);
         } else {
             str.overwrite(
                 scriptTag.start + 1,
@@ -87,10 +83,11 @@ export function createRenderFunction({
             );
         }
 
-        const scriptEndTagStart = htmlx.lastIndexOf('<', scriptTag.end - 1);
         for (const rootSnippet of rootSnippets) {
-            str.move(rootSnippet[0], rootSnippet[1], scriptEndTagStart);
+            str.move(rootSnippet[0], rootSnippet[1], scriptTagEnd);
         }
+
+        const scriptEndTagStart = htmlx.lastIndexOf('<', scriptTag.end - 1);
         // wrap template with callback
         str.overwrite(scriptEndTagStart, scriptTag.end, `${slotsDeclaration};\nasync () => {`, {
             contentOnly: true
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
@@ -594,7 +594,7 @@ export class ExportedNames {
     ): string[] {
         return names.map(([key, value]) => {
             if (value.implicitChildren) {
-                return `children?: ${
+                return `children: ${
                     value.implicitChildren === 'empty'
                         ? '__sveltets_2_snippet()'
                         : '$$implicit_children'
diff --git a/packages/svelte2tsx/svelte-shims-v4.d.ts b/packages/svelte2tsx/svelte-shims-v4.d.ts
@@ -148,7 +148,8 @@ declare function __sveltets_2_cssProp(prop: Record<string, any>): {};
 // @ts-ignore Svelte v3/v4 don't have this
 declare function __sveltets_2_ensureSnippet(val: ReturnType<import('svelte').Snippet>): any;
 // @ts-ignore Svelte v3/v4 don't have this
-declare function __sveltets_2_snippet<T = void>(t: T): import('svelte').Snippet<T>;
+declare function __sveltets_2_snippet(): import('svelte').Snippet<void>;
+declare function __sveltets_2_snippet<T>(t: T): import('svelte').Snippet<T>;
 
 /** @internal PRIVATE API, DO NOT USE */
 type __sveltets_2_SvelteAnimationReturnType = {
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/snippet.v5/expected-svelte5.js b/packages/svelte2tsx/test/htmlx2jsx/samples/snippet.v5/expected-svelte5.js
@@ -1,10 +1,10 @@
  var foo/*Ωignore_startΩ*/: import('svelte').Snippet<any>/*Ωignore_endΩ*/ = (x) => {
 	 { svelteHTML.createElement("div", {}); x; }
-return __sveltets_2_any(0)}
+return __sveltets_2_any(0)};
 
   var bar/*Ωignore_startΩ*/: import('svelte').Snippet/*Ωignore_endΩ*/ = () => {
 	 { svelteHTML.createElement("div", {});  }
-return __sveltets_2_any(0)}
+return __sveltets_2_any(0)};
 
 ;__sveltets_2_ensureSnippet(foo(1));
 ;__sveltets_2_ensureSnippet(bar());
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/ts-in-template.v5/expected-svelte5.js b/packages/svelte2tsx/test/htmlx2jsx/samples/ts-in-template.v5/expected-svelte5.js
@@ -16,7 +16,7 @@ try { const $$_value = await (foo as Promise<void>);{ const result: any = $$_val
 
 item as string;  
 
- var foo/*Ωignore_startΩ*/: import('svelte').Snippet<string>/*Ωignore_endΩ*/ = (bar: string) => { return __sveltets_2_any(0)}
+ var foo/*Ωignore_startΩ*/: import('svelte').Snippet<string>/*Ωignore_endΩ*/ = (bar: string) => { return __sveltets_2_any(0)};
 
 ;__sveltets_2_ensureSnippet(foo(bar as string));
 
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected-svelte5.ts
@@ -8,7 +8,7 @@ async () => {
  { svelteHTML.createElement("div", {});
      { __sveltets_createSlot("default", { "a":b,});  }
  }};
-let $$implicit_children = {a:b};
+let $$implicit_children = __sveltets_2_snippet({a:b});
 return { props: {children: $$implicit_children}, slots: {'default': {a:b}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected-svelte5.ts
@@ -12,7 +12,7 @@ async () => {
      { __sveltets_createSlot("test", {    "c":d,e,}); }
      { __sveltets_createSlot("abc-cde.113", { }); }
  }};
-let $$implicit_children = {a:b};
+let $$implicit_children = __sveltets_2_snippet({a:b});
 return { props: {children: $$implicit_children}, slots: {'default': {a:b}, 'test': {c:d, e:e}, 'abc-cde.113': {}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-interface/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-interface/expected-svelte5.ts
@@ -18,7 +18,7 @@ async () => {
      { __sveltets_createSlot("default", {  "a":b,});}
      { __sveltets_createSlot("foo", {   b,});}
  }};
-let $$implicit_children = {a:b};
+let $$implicit_children = __sveltets_2_snippet({a:b});
 return { props: {children: $$implicit_children}, slots: {} as unknown as $$Slots, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-type/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-type/expected-svelte5.ts
@@ -18,7 +18,7 @@ async () => {
      { __sveltets_createSlot("default", {  "a":b,});}
      { __sveltets_createSlot("foo", {   b,});}
  }};
-let $$implicit_children = {a:b};
+let $$implicit_children = __sveltets_2_snippet({a:b});
 return { props: {children: $$implicit_children}, slots: {} as unknown as $$Slots, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected-svelte5.ts
@@ -8,7 +8,7 @@ async () => {
  { svelteHTML.createElement("div", {});
      { __sveltets_createSlot("default", {       "a":b,b,"c":`b`,"d":`a${b}`,"e":b,});  }
  }};
-let $$implicit_children = {a:b, b:b, c:"b", d:"__svelte_ts_string", e:b};
+let $$implicit_children = __sveltets_2_snippet({a:b, b:b, c:"b", d:"__svelte_ts_string", e:b});
 return { props: {children: $$implicit_children}, slots: {'default': {a:b, b:b, c:"b", d:"__svelte_ts_string", e:b}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-fallback/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-fallback/expected-svelte5.ts
@@ -5,7 +5,7 @@ async () => { { __sveltets_createSlot("default", {}); { svelteHTML.createElement
  { __sveltets_createSlot("foo", {    bar,"baz":`boo`,});
      { svelteHTML.createElement("p", {});  }
  }};
-return { props: {children: __sveltets_2_snippet}, slots: {'default': {}, 'foo': {bar:bar, baz:"boo"}}, events: {} }}
+return { props: {children: __sveltets_2_snippet()}, slots: {'default': {}, 'foo': {bar:bar, baz:"boo"}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected-svelte5.ts
@@ -4,7 +4,7 @@
 async () => { { const $$_tneraP0C = __sveltets_2_ensureComponent(Parent); const $$_tneraP0 = new $$_tneraP0C({ target: __sveltets_2_any(), props: {      children:() => { return __sveltets_2_any(0); },"propA":true,propB,"propC":`val1`,"propD":`val2`,"propE":`a${a}b${b}`,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_tneraP0.$$slot_def.default;$$_$$;
      { __sveltets_createSlot("default", { foo,});}
  }Parent}};
-let $$implicit_children = {foo:__sveltets_2_instanceOf(Parent).$$slot_def['default'].foo};
+let $$implicit_children = __sveltets_2_snippet({foo:__sveltets_2_instanceOf(Parent).$$slot_def['default'].foo});
 return { props: {children: $$implicit_children}, slots: {'default': {foo:__sveltets_2_instanceOf(Parent).$$slot_def['default'].foo}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected-svelte5.ts
@@ -9,7 +9,7 @@ async () => {    { try { const $$_value = await (promise);{ const value = $$_val
    { const $$_value = await (promise2);{ const { b } = $$_value; 
      { __sveltets_createSlot("second", {   "a":b,});  }
 }}};
-let $$implicit_children = {a:__sveltets_2_unwrapPromiseLike(promise)};
+let $$implicit_children = __sveltets_2_snippet({a:__sveltets_2_unwrapPromiseLike(promise)});
 return { props: {children: $$implicit_children}, slots: {'default': {a:__sveltets_2_unwrapPromiseLike(promise)}, 'err': {err:__sveltets_2_any({})}, 'second': {a:(({ b }) => b)(__sveltets_2_unwrapPromiseLike(promise2))}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected-svelte5.ts
@@ -7,7 +7,7 @@ async () => {  for(let item of __sveltets_2_ensureArray(items)){
   for(let { a } of __sveltets_2_ensureArray(items2)){
      { __sveltets_createSlot("second", {  a,});  }
 }};
-let $$implicit_children = {a:__sveltets_2_unwrapArr(items)};
+let $$implicit_children = __sveltets_2_snippet({a:__sveltets_2_unwrapArr(items)});
 return { props: {children: $$implicit_children}, slots: {'default': {a:__sveltets_2_unwrapArr(items)}, 'second': {a:(({ a }) => a)(__sveltets_2_unwrapArr(items2))}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected-svelte5.ts
@@ -6,7 +6,7 @@ async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component);
          { __sveltets_createSlot("default", {a,}); }
      }}
  Component}};
-let $$implicit_children = {a:__sveltets_2_instanceOf(Component).$$slot_def['b'].a};
+let $$implicit_children = __sveltets_2_snippet({a:__sveltets_2_instanceOf(Component).$$slot_def['b'].a});
 return { props: {children: $$implicit_children}, slots: {'default': {a:__sveltets_2_instanceOf(Component).$$slot_def['b'].a}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected-svelte5.ts
@@ -4,7 +4,7 @@
 async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {     children:() => { return __sveltets_2_any(0); },}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,name:n,thing,whatever:{ bla },} = $$_tnenopmoC0.$$slot_def.default;$$_$$;
      { __sveltets_createSlot("default", {   n,thing,bla,});}
  }Component}};
-let $$implicit_children = {n:__sveltets_2_instanceOf(Component).$$slot_def['default'].name, thing:__sveltets_2_instanceOf(Component).$$slot_def['default'].thing, bla:(({ bla }) => bla)(__sveltets_2_instanceOf(Component).$$slot_def['default'].whatever)};
+let $$implicit_children = __sveltets_2_snippet({n:__sveltets_2_instanceOf(Component).$$slot_def['default'].name, thing:__sveltets_2_instanceOf(Component).$$slot_def['default'].thing, bla:(({ bla }) => bla)(__sveltets_2_instanceOf(Component).$$slot_def['default'].whatever)});
 return { props: {children: $$implicit_children}, slots: {'default': {n:__sveltets_2_instanceOf(Component).$$slot_def['default'].name, thing:__sveltets_2_instanceOf(Component).$$slot_def['default'].thing, bla:(({ bla }) => bla)(__sveltets_2_instanceOf(Component).$$slot_def['default'].whatever)}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected-svelte5.ts
@@ -12,7 +12,7 @@ async () => {  for(let item of __sveltets_2_ensureArray(items)){
     d;
 }}
  { __sveltets_createSlot("third", {   d,c,}); }};
-let $$implicit_children = {a:(({ a }) => a)(__sveltets_2_unwrapArr(__sveltets_2_unwrapArr(items)))};
+let $$implicit_children = __sveltets_2_snippet({a:(({ a }) => a)(__sveltets_2_unwrapArr(__sveltets_2_unwrapArr(items)))});
 return { props: {children: $$implicit_children}, slots: {'default': {a:(({ a }) => a)(__sveltets_2_unwrapArr(__sveltets_2_unwrapArr(items)))}, 'second': {a:a}, 'third': {d:d, c:c}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected-svelte5.ts
@@ -4,7 +4,7 @@
 async () => {  for(let item of __sveltets_2_ensureArray(items)){
      { __sveltets_createSlot("default", {             "a":item,"b":{ item },"c":{ item: 'abc' }.item,"d":{ item: item },"e":$item,"f":$item,...g,...item,});  }
 }};
-let $$implicit_children = {a:__sveltets_2_unwrapArr(items), b:{ item:__sveltets_2_unwrapArr(items) }, c:{ item: 'abc' }.item, d:{ item: __sveltets_2_unwrapArr(items) }, e:$item, f:$item, ...g, ...__sveltets_2_unwrapArr(items)};
+let $$implicit_children = __sveltets_2_snippet({a:__sveltets_2_unwrapArr(items), b:{ item:__sveltets_2_unwrapArr(items) }, c:{ item: 'abc' }.item, d:{ item: __sveltets_2_unwrapArr(items) }, e:$item, f:$item, ...g, ...__sveltets_2_unwrapArr(items)});
 return { props: {children: $$implicit_children}, slots: {'default': {a:__sveltets_2_unwrapArr(items), b:{ item:__sveltets_2_unwrapArr(items) }, c:{ item: 'abc' }.item, d:{ item: __sveltets_2_unwrapArr(items) }, e:$item, f:$item, ...g, ...__sveltets_2_unwrapArr(items)}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected-svelte5.ts
@@ -4,7 +4,7 @@
 async () => {  { const $$_each = __sveltets_2_ensureArray(items); for(let items of $$_each){
      { __sveltets_createSlot("default", { "a":items,});  }
 }}};
-let $$implicit_children = {a:__sveltets_2_unwrapArr(items)};
+let $$implicit_children = __sveltets_2_snippet({a:__sveltets_2_unwrapArr(items)});
 return { props: {children: $$implicit_children}, slots: {'default': {a:__sveltets_2_unwrapArr(items)}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/creates-dts/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/creates-dts/expected-svelte5.ts
@@ -22,7 +22,7 @@ async () => {
 
  { svelteHTML.createElement("button", { "on:click":undefined,});  }
  { __sveltets_createSlot("default", {bar,}); }};
-let $$implicit_children = {bar:bar};
+let $$implicit_children = __sveltets_2_snippet({bar:bar});
 return { props: {
 /** @type {boolean} */bar: bar , foobar: foobar , children: $$implicit_children}, slots: {'default': {bar:bar}}, events: {'click':__sveltets_2_mapElementEvent('click'), 'hi': __sveltets_2_customEvent} }}
 const __propDef = __sveltets_2_partial(['foobar','children'], __sveltets_2_with_any_event(render()));
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/creates-no-script-dts/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/creates-no-script-dts/expected-svelte5.ts
@@ -5,7 +5,7 @@ async () => { { svelteHTML.createElement("button", { "on:click":undefined,}); {
    { const $$_value = await (Promise.resolve(0));{ const n = $$_value; 
   n;
 }}};
-return { props: {children: __sveltets_2_snippet}, slots: {'default': {}}, events: {'click':__sveltets_2_mapElementEvent('click')} }}
+return { props: {children: __sveltets_2_snippet()}, slots: {'default': {}}, events: {'click':__sveltets_2_mapElementEvent('click')} }}
 const __propDef = __sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()));
 /** @typedef {typeof __propDef.props}  InputProps */
 /** @typedef {typeof __propDef.events}  InputEvents */
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-instance-script.v5/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-instance-script.v5/expected-svelte5.ts
@@ -1,10 +1,10 @@
 ///<reference types="svelte" />
 ;function render() {
-
-    let foo = true;
-    bar;
   var bar/*Ωignore_startΩ*/: import('svelte').Snippet/*Ωignore_endΩ*/ = () => { foo;
 return __sveltets_2_any(0)};
+    let foo = true;
+    bar;
+;
 async () => {
 
 };
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected-svelte5.ts
@@ -23,8 +23,8 @@ function render/*Ωignore_startΩ*/<A,B extends keyof A,C extends boolean>/*Ωig
 async () => {
 
  { __sveltets_createSlot("default", { c,});}};
-let $$implicit_children = {c:c};
-return { props: {a: a , b: b , c: c , getA: getA , children: $$implicit_children} as {a: A, b: B, c: C, getA?: typeof getA, children: typeof $$implicit_children}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }}
+let $$implicit_children = __sveltets_2_snippet({c:c});
+return { props: {a: a , b: b , c: c , getA: getA , children: $$implicit_children} as {a: A, b: B, c: C, getA?: typeof getA, children?: typeof $$implicit_children}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }}
 class __sveltets_Render<A,B extends keyof A,C extends boolean> {
     props() {
         return render<A,B,C>().props;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected-svelte5.ts
@@ -23,8 +23,8 @@ function render/*Ωignore_startΩ*/<A,B extends keyof A,C extends boolean>/*Ωig
 async () => {
 
  { __sveltets_createSlot("default", { c,});}};
-let $$implicit_children = {c:c};
-return { props: {a: a , b: b , c: c , getA: getA , children: $$implicit_children} as {a: A, b: B, c: C, getA?: typeof getA, children: typeof $$implicit_children}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }}
+let $$implicit_children = __sveltets_2_snippet({c:c});
+return { props: {a: a , b: b , c: c , getA: getA , children: $$implicit_children} as {a: A, b: B, c: C, getA?: typeof getA, children?: typeof $$implicit_children}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }}
 class __sveltets_Render<A,B extends keyof A,C extends boolean> {
     props() {
         return render<A,B,C>().props;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected-svelte5.ts
@@ -22,8 +22,8 @@ async () => {
 
  { svelteHTML.createElement("button", { "on:click":undefined,});  }
  { __sveltets_createSlot("default", {bar,}); }};
-let $$implicit_children = {bar:bar};
-return { props: {bar: bar , foobar: foobar , children: $$implicit_children} as {bar: Bar, foobar?: typeof foobar, children: typeof $$implicit_children}, slots: {'default': {bar:bar}}, events: {...__sveltets_2_toEventTypings<{swipe: string}>(), 'click':__sveltets_2_mapElementEvent('click')} }}
+let $$implicit_children = __sveltets_2_snippet({bar:bar});
+return { props: {bar: bar , foobar: foobar , children: $$implicit_children} as {bar: Bar, foobar?: typeof foobar, children?: typeof $$implicit_children}, slots: {'default': {bar:bar}}, events: {...__sveltets_2_toEventTypings<{swipe: string}>(), 'click':__sveltets_2_mapElementEvent('click')} }}
 const __propDef = __sveltets_2_with_any_event(render());
 export type InputProps = typeof __propDef.props;
 export type InputEvents = typeof __propDef.events;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expected-svelte5.ts
@@ -19,8 +19,8 @@ function render<A, B extends keyof A, C extends boolean>() {
 async () => {
 
  { __sveltets_createSlot("default", { c,});}};
-let $$implicit_children = {c:c};
-return { props: {a: a , b: b , c: c , getA: getA , children: $$implicit_children} as {a: A, b: B, c: C, getA?: typeof getA, children: typeof $$implicit_children}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }}
+let $$implicit_children = __sveltets_2_snippet({c:c});
+return { props: {a: a , b: b , c: c , getA: getA , children: $$implicit_children} as {a: A, b: B, c: C, getA?: typeof getA, children?: typeof $$implicit_children}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }}
 class __sveltets_Render<A,B extends keyof A,C extends boolean> {
     props() {
         return render<A,B,C>().props;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected-svelte5.ts
@@ -11,7 +11,7 @@ async () => {
  { __sveltets_createSlot("foo", {  });}
  { __sveltets_createSlot("dashed-name", {  });}
  { __sveltets_createSlot("default", {});}};
-return { props: {children: __sveltets_2_snippet}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, events: {} }}
+return { props: {children: __sveltets_2_snippet()}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['children'], __sveltets_2_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected-svelte5.ts
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected-svelte5.ts
