Fix await block related bugs (#39)

* Fix await block related bugs

* fix

Author: ota-meshi

src/ast.ts

@@ -335,14 +335,14 @@ export interface SvelteAwaitPendingBlock extends BaseNode {
 /** Node of await then block. e.g. `{:then}` */
 export interface SvelteAwaitThenBlock extends BaseNode {
     type: "SvelteAwaitThenBlock"
-    value: ESTree.Pattern
+    value: ESTree.Pattern | null
     children: Child[]
     parent: SvelteAwaitBlock
 }
 /** Node of await catch block. e.g. `{:catch}` */
 export interface SvelteAwaitCatchBlock extends BaseNode {
     type: "SvelteAwaitCatchBlock"
-    error: ESTree.Pattern
+    error: ESTree.Pattern | null
     children: Child[]
     parent: SvelteAwaitBlock
 }

src/context/script-let.ts

@@ -378,7 +378,14 @@ export class ScriptLetContext {
                         const p = fn.params[index]
                         ;(p as any).parent = parents![index]
                         if (this.ctx.isTypeScript()) {
+                            const typeAnnotation = (p as any).typeAnnotation
                             delete (p as any).typeAnnotation
+
+                            p.range![1] = typeAnnotation.range[0]
+                            p.loc!.end = {
+                                line: typeAnnotation.loc.start.line,
+                                column: typeAnnotation.loc.start.column,
+                            }
                         }
                     }
 

src/parser/converts/block.ts

@@ -213,23 +213,31 @@ export function convertAwaitBlock(
         const thenStart = awaitBlock.pending ? node.then.start : node.start
         const thenBlock: SvelteAwaitThenBlock = {
             type: "SvelteAwaitThenBlock",
-            value: null as any,
+            value: null,
             children: [],
             parent: awaitBlock,
             ...ctx.getConvertLocation({
                 start: thenStart,
                 end: node.then.end,
             }),
         }
-        ctx.scriptLet.nestBlock(
-            thenBlock,
-            [node.value],
-            [thenBlock],
-            ([value]) => {
-                thenBlock.value = value
-            },
-            [`typeof ${ctx.getText(node.expression)}`],
-        )
+        if (node.value) {
+            ctx.scriptLet.nestBlock(
+                thenBlock,
+                [node.value],
+                [thenBlock],
+                ([value]) => {
+                    thenBlock.value = value
+                },
+                [
+                    `Parameters<Parameters<(typeof ${ctx.getText(
+                        node.expression,
+                    )})["then"]>[0]>[0]`,
+                ],
+            )
+        } else {
+            ctx.scriptLet.nestBlock(thenBlock)
+        }
         thenBlock.children.push(...convertChildren(node.then, thenBlock, ctx))
         if (awaitBlock.pending) {
             extractMustacheBlockTokens(thenBlock, ctx, { startOnly: true })
@@ -253,7 +261,7 @@ export function convertAwaitBlock(
                 : node.start
         const catchBlock: SvelteAwaitCatchBlock = {
             type: "SvelteAwaitCatchBlock",
-            error: null as any,
+            error: null,
             children: [],
             parent: awaitBlock,
             ...ctx.getConvertLocation({
@@ -262,15 +270,19 @@ export function convertAwaitBlock(
             }),
         }
 
-        ctx.scriptLet.nestBlock(
-            catchBlock,
-            [node.error],
-            [catchBlock],
-            ([error]) => {
-                catchBlock.error = error
-            },
-            ["Error"],
-        )
+        if (node.error) {
+            ctx.scriptLet.nestBlock(
+                catchBlock,
+                [node.error],
+                [catchBlock],
+                ([error]) => {
+                    catchBlock.error = error
+                },
+                ["Error"],
+            )
+        } else {
+            ctx.scriptLet.nestBlock(catchBlock)
+        }
         catchBlock.children.push(
             ...convertChildren(node.catch, catchBlock, ctx),
         )

src/parser/svelte-ast-types.ts

@@ -74,9 +74,9 @@ export interface AwaitBlock extends BaseNode {
     type: "AwaitBlock"
     expression: ESTree.Expression
     pending: PendingBlock
-    value: ESTree.Pattern
+    value: ESTree.Pattern | null
     then: ThenBlock
-    error: ESTree.Pattern
+    error: ESTree.Pattern | null
     catch: CatchBlock
 }
 export interface PendingBlock extends BaseNode {

tests/fixtures/parser/ast/await01-input.svelte

@@ -0,0 +1,18 @@
+<script>
+let expression = new Promise()
+</script>
+
+{#await expression}
+{:then}
+{:catch}
+{/await}
+
+{#await expression}
+{:then}
+{/await}
+
+{#await expression then name}
+{/await}
+
+{#await expression catch name}
+{/await}

tests/fixtures/parser/ast/await01-no-unused-vars-result.json

@@ -0,0 +1,14 @@
+[
+  {
+    "ruleId": "no-unused-vars",
+    "code": "name",
+    "line": 14,
+    "column": 25
+  },
+  {
+    "ruleId": "no-unused-vars",
+    "code": "name",
+    "line": 17,
+    "column": 26
+  }
+]