Correct cases where arrow functions contain deeply nested expressions

containing await and logical/conditional operators Fix edge cases in code output (sparse array constants, object pattern precedence, generator member functions), add everything.js syntax tests
MatAtBread · Dec 16, 2015 · f0d07e9 · f0d07e9
1 parent 84d0157
commit f0d07e9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -736,6 +736,11 @@ The test is a simple set of nested loops calling async functions that don't do m
 Changelog
 ==========
 
+16-Dec-15 v2.3.9
+
+- Correct cases where arrow functions contain deeply nested expressions containing await and logical/conditional operators
+- Fix edge cases in code output (sparse array constants, object pattern precedence, generator member functions), add everything.js syntax tests
+
 10-Dec-15 v2.3.7
 
 - Correctly asynchronize ES6 `for...in` loops.

diff --git a/lib/arboriculture.js b/lib/arboriculture.js
@@ -258,6 +258,18 @@ function asynchronize(pr,__sourceMapping,opts,logger) {
         return null ;
     }
 
+    function makeArrowFunctionBlock(node) {
+        if (node.type==='ArrowFunctionExpression' && node.body.type !== 'BlockStatement') {
+            node.body = {
+                    type: "BlockStatement",
+                    body: [{
+                        type: "ReturnStatement",
+                        argument: node.body
+                    }]
+            } ;
+        }
+    }
+
     pr.ast = fixSuperReferences(pr.ast) ;
     if (opts.generators) {
         pr.ast = asyncSpawn(pr.ast) ;
@@ -589,6 +601,7 @@ function asynchronize(pr,__sourceMapping,opts,logger) {
                     } ;
                     node.right = r ;
                 }
+
                 var stmt,body ;
                 for (var n=1; n<path.length; n++) {
                     if (body = examine(path[n].self).isBlockStatement) {
@@ -936,16 +949,6 @@ function asynchronize(pr,__sourceMapping,opts,logger) {
                     node.alternate = {type:'BlockStatement',body:[node.alternate]} ;
             }
 
-            if (node.type==='ArrowFunctionExpression' && node.body.type !== 'BlockStatement' && containsAwait(node.body)) {
-                node.body = {
-                        type: "BlockStatement",
-                        body: [{
-                            type: "ReturnStatement",
-                            argument: node.body
-                        }]
-                } ;
-            }
-
             descend();
 
             if (examine(node).isAwait) {
@@ -2149,9 +2152,13 @@ function asynchronize(pr,__sourceMapping,opts,logger) {
      * must be initialized at the point on declaration, and the dependent RHS could easily be async */
     function hoistScopedDeclarations(ast) {
         parser.treeWalker(ast,function(node, descend,path){
+            var awaiting = containsAwait(node) ; 
+            if (awaiting)
+                makeArrowFunctionBlock(node) ;
+
             descend() ;
             var block;
-            if ((block = examine(node).isBlockStatement) && containsAwait(node)) {
+            if ((block = examine(node).isBlockStatement) && awaiting) {
                 // For this block, find all the hoistable classes, lets and consts
                 var classes = [] ;
                 var lets = [] ;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodent",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "NoDent - Asynchronous Javascript language extensions",
   "main": "nodent.js",
   "scripts": {