Merge pull request #129 from fink-lang/fix-do-expr

fix: scoping in do-expr transformation

src/js/do-expression.fnk

@@ -5,7 +5,7 @@ babel_types = import '@babel/types'
   isVariableDeclarator, isArrowFunctionExpression, isExpressionStatement
   isAssignmentExpression
   isReturnStatement
-  arrowFunctionExpression, callExpression
+  arrowFunctionExpression, callExpression, blockStatement
 } = babel_types
 {set_props} = import '@fink/js-interop/reflect.fnk'
 {undefined} = import '@fink/js-interop/nullish.fnk'
@@ -34,10 +34,6 @@ simple = fn body, sl=false:
           match {sl, stmnt}:
             {sl: true, stmnt: isLabeledStatement ?}:
               stmnt.node.body
-            # TODO:
-            # {sl: true, stmnt: isIfStatement ?}:
-            #   console.log body
-            #   body.node
             else:
               simple stmnt
         else:
@@ -120,6 +116,22 @@ replace_with_assign = fn target, path:
     consume_all
 
 
+replace_with_simple_assign = fn target, path:
+  id = target.node.left
+  target.parentPath.insertBefore blockStatement path.node.body.body
+
+  pipe last_expressions path:
+    map fn expr:
+      expr.replaceWith
+        wrap_with_comment_loc
+          assignmentExpression '=', id, expr.node.expression
+          expr.node.expression
+
+    consume_all
+
+  target.replaceWithMultiple []
+
+
 
 transform_do_expr = fn path:
   {parentPath: parent} = path
@@ -150,18 +162,7 @@ transform_do_expr = fn path:
 
 
     isAssignmentExpression ?:
-      id = parent.get 'left'
-
-      pipe last_expressions path:
-        map fn expr:
-          expr.replaceWith
-            wrap_with_comment_loc
-              assignmentExpression '=', id.node, expr.node.expression
-              expr.node.expression
-
-        consume_all
-
-      parent.replaceWithMultiple path.node.body.body
+      replace_with_simple_assign parent, path
 
     else:
       # TODO: {spam.ham.ni: {foo, bar} = spam

src/lang/conditionals/match.test.fnk.snap

@@ -661,14 +661,18 @@ exports[`match value assertions compiles do-expr 1`] = `
   const ˆvalue_1 = bar;
 
   if (ˆvalue_1 === spam) {
-    ni;
-    _do_result = shrub(foobar);
+    {
+      ni;
+      _do_result = shrub(foobar);
+    }
     break ˆmatch_2;
   }
 
   {
-    shrub;
-    _do_result = spam(ni);
+    {
+      shrub;
+      _do_result = spam(ni);
+    }
     break ˆmatch_2;
   }
 }