closes riot/riot#2195

lib/compiler.js

@@ -105,7 +105,7 @@ var SPEC_TYPES = /^"(?:number|date(?:time)?|time|month|email|color)\b/i
  * Matches the 'import' statement
  * @const {RegExp}
  */
-var IMPORT_STATEMENT = /^\s*import(?:(?:\s|[^\s'"])*)['|"].*\n?/gm
+var IMPORT_STATEMENT = /^\s*import(?!\w)(?:(?:\s|[^\s'"])*)['|"].*\n?/gm
 
 /**
  * Matches trailing spaces and tabs by line.
@@ -337,7 +337,7 @@ function compileHTML (html, opts, pcex) {
  * 2016-01-18: rewritten to capture only the method name (performant)
  * @const {RegExp}
  */
-var JS_ES6SIGN = /^[ \t]*([$_A-Za-z][$\w]*)\s*\([^()]*\)\s*{/m
+var JS_ES6SIGN = /^[ \t]*(((?:async)\s*)?([$_A-Za-z][$\w]*))\s*\([^()]*\)\s*{/m
 
 /**
  * Regex for remotion of multiline and single-line JavaScript comments, merged with
@@ -368,6 +368,8 @@ function riotjs (js) {
     match,
     toes5,
     pos,
+    method,
+    prefix,
     name,
     RE = RegExp
 
@@ -379,9 +381,18 @@ function riotjs (js) {
     js  = RE.rightContext
     pos = skipBody(js, JS_ES6END)
 
-    name  = match[1]
+    method = match[1]
+    prefix = match[2] || ''
+    name  = match[3]
+
     toes5 = !/^(?:if|while|for|switch|catch|function)$/.test(name)
-    name  = toes5 ? match[0].replace(name, 'this.' + name + ' = function') : match[0]
+
+    if (toes5) {
+      name = match[0].replace(method, 'this.' + name + ' =' + prefix + ' function')
+    } else {
+      name = match[0]
+    }
+
     parts.push(name, js.slice(0, pos))
     js = js.slice(pos)
 

src/core.js

@@ -368,7 +368,7 @@ function compileHTML (html, opts, pcex) {
  * 2016-01-18: rewritten to capture only the method name (performant)
  * @const {RegExp}
  */
-var JS_ES6SIGN = /^[ \t]*([$_A-Za-z][$\w]*)\s*\([^()]*\)\s*{/m
+var JS_ES6SIGN = /^[ \t]*(((?:async)\s*)?([$_A-Za-z][$\w]*))\s*\([^()]*\)\s*{/m
 
 /**
  * Regex for remotion of multiline and single-line JavaScript comments, merged with
@@ -399,6 +399,8 @@ function riotjs (js) {
     match,
     toes5,
     pos,
+    method,
+    prefix,
     name,
     RE = RegExp
 
@@ -412,9 +414,18 @@ function riotjs (js) {
     pos = skipBody(js, JS_ES6END)
 
     // convert ES6 method signature to ES5 function, exclude JS keywords
-    name  = match[1]
+    method = match[1] // the full match
+    prefix = match[2] || '' // async or ''
+    name  = match[3] // the method name
+
     toes5 = !/^(?:if|while|for|switch|catch|function)$/.test(name)
-    name  = toes5 ? match[0].replace(name, 'this.' + name + ' = function') : match[0]
+
+    if (toes5) {
+      name = match[0].replace(method, 'this.' + name + ' =' + prefix + ' function')
+    } else {
+      name = match[0]
+    }
+
     parts.push(name, js.slice(0, pos))
     js = js.slice(pos)
 

test/specs/expect/es6-async.js

@@ -0,0 +1,9 @@
+riot.tag2('async', '<h1>async test</h1>', '', '', function(opts) {
+    this.foo = function(){
+      return 'foo'
+    }.bind(this)
+    this.doAsyncThing =async  function(){
+      await new Promise((resolve) =>{setTimeout(resolve,2000)});
+      console.log("done");
+    }.bind(this)
+});

test/specs/fixtures/es6-async.tag

@@ -0,0 +1,14 @@
+<async>
+  <h1>async test</h1>
+
+  <script>
+    foo() {
+      return 'foo'
+    }
+
+    async doAsyncThing() {
+      await new Promise((resolve) => {setTimeout(resolve,2000)});
+      console.log("done");
+    }
+  </script>
+</async>

test/specs/tag.js

@@ -79,6 +79,10 @@ describe('Compile tags', function () {
     testFile('es6-import')
   })
 
+  it('Support short cut async functions', function () {
+    testFile('es6-async')
+  })
+
   it('Detect es6 import in the untagged JS block', function () {
     testFile('es6-import-untagged')
   })