use hasType

babel · Jun 14, 2019 · 9a99cc3 · 9a99cc3
1 parent 2cbd4f6
commit 9a99cc3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/packages/babel-traverse/src/path/introspection.js b/packages/babel-traverse/src/path/introspection.js
@@ -109,24 +109,6 @@ export function canSwapBetweenExpressionAndStatement(replacement) {
   return false;
 }
 
-/**
- * Check whether the current path contains an `await` expression
- */
-
-export function containsAwaitExpression(): boolean {
-  let foundAwait = false;
-  this.traverse({
-    Function(path) {
-      path.skip();
-    },
-    AwaitExpression(path) {
-      foundAwait = true;
-      path.stop();
-    },
-  });
-  return foundAwait;
-}
-
 /**
  * Check whether the current path references a completion record
  */

diff --git a/packages/babel-traverse/src/path/replacement.js b/packages/babel-traverse/src/path/replacement.js
@@ -260,7 +260,14 @@ export function replaceExpressionWithStatements(nodes: Array<Object>) {
   callee.arrowFunctionToExpression();
 
   // (() => await xxx)() -> await (async () => await xxx)();
-  if (isParentAsync && this.get("callee.body").containsAwaitExpression()) {
+  if (
+    isParentAsync &&
+    traverse.hasType(
+      this.get("callee.body").node,
+      "AwaitExpression",
+      t.FUNCTION_TYPES,
+    )
+  ) {
     callee.set("async", true);
     this.replaceWith(t.awaitExpression(this.node));
   }