Switch await to be the right side of the equality and some cleanup.

Author: gdotdesign

core/source/File.mint

@@ -46,8 +46,8 @@ module File {
   * It might not resolve if the user cancels the dialog.
 
     {
-      await files =
-        File.selectMultiple("application/json")
+      files =
+        await File.selectMultiple("application/json")
 
       Debug.log(files)
     }
@@ -87,8 +87,8 @@ module File {
   * It might not resolve if the user cancels the dialog.
 
     {
-      await file =
-        File.select("application/json")
+      file =
+        await File.select("application/json")
 
       Debug.log(file)
     }
@@ -124,8 +124,8 @@ module File {
   Reads the contents of the given file as a Data URL.
 
     {
-      await file =
-        File.fromString("Some content...", "test.txt", "text/plain")
+      file =
+        await File.fromString("Some content...", "test.txt", "text/plain")
 
       url =
         File.readAsDataURL(file)
@@ -151,8 +151,8 @@ module File {
   Reads the contents of the given file as a String.
 
     {
-      await file =
-        File.create("Some content...", "test.txt", "text/plain")
+      file =
+        await File.create("Some content...", "test.txt", "text/plain")
 
       url =
         File.readAsString(file)
@@ -178,8 +178,8 @@ module File {
   Prompts a save dialog for the given file.
 
     {
-      await file =
-        File.select(*)
+      file =
+        await File.select(*)
 
       File.download(file)
     }

core/source/Http.mint

@@ -45,7 +45,7 @@ enum Http.Error {
 Module for sending HTTP requests.
 
 ```
-await request =
+request = await
   "https://httpbin.org/get"
   |> Http.get()
   |> Http.send()

core/tests/tests/Http.mint

@@ -261,8 +261,8 @@ component Test.Http {
   }
 
   fun componentDidMount : Promise(Void) {
-    await request =
-      Http.empty()
+    request =
+      await Http.empty()
       |> Http.url(url)
       |> Http.method(method)
       |> Http.sendWithId("test")

core/tests/tests/Promise.mint

@@ -2,8 +2,8 @@ component Test.Promise {
   state result : String = ""
 
   fun resolve : Promise(Void) {
-    await newResult =
-      Promise.resolve("resolved")
+    newResult =
+      await Promise.resolve("resolved")
 
     await next { result = newResult }
   }
@@ -29,8 +29,8 @@ component Test.Promise2 {
 
     await next { resolve = resolve }
 
-    await newResult =
-      promise
+    newResult =
+      await promise
 
     await next { result = newResult }
   }

spec/compilers/last_statement

@@ -0,0 +1,14 @@
+component Main {
+  fun render : String {
+    x =
+      "hello"
+  }
+}
+--------------------------------------------------------------------------------
+class A extends _C {
+  render() {
+    return `hello`;
+  }
+};
+
+A.displayName = "Main";

spec/formatters/statement_with_await

@@ -0,0 +1,12 @@
+module A {
+  fun test : Promise(String) {
+    x=await"hello"
+  }
+}
+--------------------------------------------------------------------------------
+module A {
+  fun test : Promise(String) {
+    x =
+      await "hello"
+  }
+}

spec/parsers/statement_spec.cr

@@ -1,7 +1,7 @@
 require "../spec_helper"
 
 describe "Statement" do
-  subject statement(:none)
+  subject statement
 
   expect_ignore ""
   expect_ignore "??"

src/ast/statement.cr

@@ -1,14 +1,9 @@
 module Mint
   class Ast
     class Statement < Node
-      enum Parent
-        None
-      end
-
-      getter target, expression, parent, await
+      getter target, expression, await
 
       def initialize(@expression : Expression,
-                     @parent : Parent,
                      @target : Node?,
                      @await : Bool,
                      @input : Data,

src/compilers/block.cr

@@ -10,17 +10,20 @@ module Mint
 
     def _compile(node : Ast::Block, for_function = false) : String
       statements =
-        node.statements.select(Ast::Statement)
+        node
+          .statements
+          .select(Ast::Statement)
+          .sort_by! { |item| resolve_order.index(item) || -1 }
 
       if statements.size == 1
         if for_function
-          js.return(compile(statements.first))
+          js.return(compile(statements.first, true))
         else
-          compile(statements.first)
+          compile(statements.first, true)
         end
       else
         compiled_statements =
-          compile(statements.sort_by! { |item| resolve_order.index(item) || -1 })
+          statements.map { |item| compile item, item == statements.last }
 
         last =
           compiled_statements.pop

src/compilers/statement.cr

@@ -1,10 +1,18 @@
 module Mint
   class Compiler
-    def _compile(node : Ast::Statement) : String
+    def compile(node : Ast::Statement, last : Bool) : String
+      if checked.includes?(node)
+        _compile(node, last)
+      else
+        ""
+      end
+    end
+
+    def _compile(node : Ast::Statement, last : Bool) : String
       right = compile node.expression
       right = "await #{right}" if node.await
 
-      if node.parent == Ast::Statement::Parent::None && (target = node.target)
+      if (target = node.target) && !last
         case target
         when Ast::Variable
           js.const(js.variable_of(target), right)

src/formatters/statement.cr

@@ -4,21 +4,21 @@ module Mint
       expression =
         format node.expression
 
-      right =
-        case node.target
-        when Nil
-          expression
+      left =
+        if node.await
+          "await #{expression}"
         else
-          target =
-            format node.target
-
-          "#{target} =\n#{indent(expression)}"
+          expression
         end
 
-      if node.await
-        "await #{right}"
+      case node.target
+      when Nil
+        left
       else
-        right
+        target =
+          format node.target
+
+        "#{target} =\n#{indent(left)}"
       end
     end
   end

src/parsers/code_block.cr

@@ -8,8 +8,8 @@ module Mint
           block(
             opening_bracket: opening_bracket,
             closing_bracket: closing_bracket) do
-            many { comment || statement(:none) }.tap do |items|
-              raise statement_error if items.select(Ast::Statement).none?
+            many { comment || statement }.tap do |items|
+              raise statement_error if items.none?
             end
           end
 

src/parsers/statement.cr

@@ -1,10 +1,7 @@
 module Mint
   class Parser
-    def statement(parent : Ast::Statement::Parent, require_name : Bool = false) : Ast::Statement?
+    def statement : Ast::Statement?
       start do |start_position|
-        await = keyword "await"
-        whitespace if await
-
         target = start do
           value = variable(track: false) || tuple_destructuring
           whitespace
@@ -16,7 +13,10 @@ module Mint
           value
         end
 
-        next if require_name && !target
+        whitespace
+        await = keyword "await"
+
+        whitespace
         body = expression
 
         next unless body
@@ -25,7 +25,6 @@ module Mint
           from: start_position,
           expression: body,
           target: target,
-          parent: parent,
           await: await,
           to: position,
           input: data)

src/type_checkers/block.cr

@@ -4,20 +4,14 @@ module Mint
       statements =
         node.statements.reject(Ast::Comment)
 
-      async =
-        node
-          .statements
-          .select(Ast::Statement)
-          .any?(&.await)
-
       scope statements do
         resolve node.statements
       end
 
       last =
         statements.last
 
-      if async
+      if node.async?
         Type.new("Promise", [cache[last]] of Checkable)
       else
         cache[last]

src/type_checkers/variable.cr

@@ -31,17 +31,7 @@ module Mint
       else
         case value = item[0]
         when Ast::Statement
-          type = resolve value
-
-          if value.parent.none?
-            type
-          else
-            if type.name.in?("Result", "Promise") && type.parameters.size == 2
-              type.parameters[1]
-            else
-              type
-            end
-          end
+          resolve value
         when Tuple(Ast::Node, Int32 | Array(Int32))
           item = value[0]