feat: use Snippet type

Author: dummdidumm

packages/svelte2tsx/src/htmlxtojsx_v2/nodes/SnippetBlock.ts

@@ -31,7 +31,8 @@ export function handleSnippet(
     element?: InlineComponent
 ): void {
     const endSnippet = str.original.lastIndexOf('{', snippetBlock.end - 1);
-    str.overwrite(endSnippet, snippetBlock.end, '}', {
+    // 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
     });
 
@@ -54,22 +55,23 @@ export function handleSnippet(
         transforms.push([startEnd, snippetBlock.end]);
         element.addProp([[snippetBlock.expression.start, snippetBlock.expression.end]], transforms);
     } else {
+        // slap any on to it to silence "implicit any" errors; JSDoc people can't add types to snippets
+        let typeAnnotation = surroundWithIgnoreComments(`: import('svelte').Snippet<any>`);
+        if (snippetBlock.context?.typeAnnotation) {
+            typeAnnotation = surroundWithIgnoreComments(
+                `: import('svelte').Snippet<${str.original.slice(
+                    snippetBlock.context.typeAnnotation.start,
+                    snippetBlock.context.typeAnnotation.end
+                )}>`
+            );
+        }
         const transforms: TransformationArray = [
             'var ',
             [snippetBlock.expression.start, snippetBlock.expression.end],
-            ' = ('
+            typeAnnotation + ' = ('
         ];
         if (snippetBlock.context) {
-            const colonIdx = str.original.indexOf(':', snippetBlock.context.end);
-            if (colonIdx > startEnd && colonIdx !== -1) {
-                transforms.push(
-                    [snippetBlock.context.start, snippetBlock.context.end],
-                    // slap any on to it to silence "implicit any" errors; JSDoc people can't add types to snippets
-                    surroundWithIgnoreComments(': any')
-                );
-            } else {
-                transforms.push([snippetBlock.context.start, snippetBlock.context.end]);
-            }
+            transforms.push([snippetBlock.context.start, snippetBlock.context.end]);
         }
         transforms.push(') => {');
 

packages/svelte2tsx/test/htmlx2jsx/samples/snippet.skip/expectedv2.js

@@ -1,13 +1,13 @@
- var foo = (x/*Ωignore_startΩ*/: any/*Ωignore_endΩ*/) => {
+ var foo/*Ωignore_startΩ*/: import('svelte').Snippet<any>/*Ωignore_endΩ*/ = (x) => {
 	 { svelteHTML.createElement("div", {}); x; }
-}
+return __sveltets_2_any(0)}
 
 ;foo(1);
 ;foo();
 
  { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {bar:(x) => {
 		 { svelteHTML.createElement("div", {}); x; }
-	},}});
+	return __sveltets_2_any(0)},}});
 	 { svelteHTML.createElement("div", {});asd; }
 
  Component}

packages/svelte2tsx/test/htmlx2jsx/samples/ts-in-template.skip/expectedv2.js

@@ -16,7 +16,7 @@ try { const $$_value = await (foo as Promise<void>);{ const result: any = $$_val
 
 item as string;  
 
- const foo = (bar: string/*Ωignore_startΩ*/: any/*Ωignore_endΩ*/) => { }
+ var foo/*Ωignore_startΩ*/: import('svelte').Snippet<string>/*Ωignore_endΩ*/ = (bar: string) => { return __sveltets_2_any(0)}
 
 ;foo(bar as string);
 

packages/svelte2tsx/test/svelte2tsx/samples/snippet-instance-script.skip/expectedv2.ts

@@ -3,8 +3,8 @@
 
     let foo = true;
     bar;
-  var bar = () => { foo;
-};
+  var bar/*Ωignore_startΩ*/: import('svelte').Snippet<any>/*Ωignore_endΩ*/ = () => { foo;
+return __sveltets_2_any(0)};
 async () => {
 
 };