Eliminate indirection to simplify code

Author: robbytx

src/utils/builder.ts

@@ -147,10 +147,10 @@ export default class Builder {
       prefixedIdentifiers.push(negatedPredicate);
     }
 
-    this.expandMacro(
-      path,
-      this._buildLogicalExpressions(prefixedIdentifiers, callExpression),
-    );
+    // Expand the macro!
+    let replacementPath = this._buildLogicalExpressions(prefixedIdentifiers, callExpression, this._debugExpression(path));
+    path.replaceWith(replacementPath);
+    path.scope.crawl();
   }
 
   /**
@@ -208,15 +208,6 @@ export default class Builder {
     });
   }
 
-  /**
-   * Performs the actually expansion of macro
-   */
-  expandMacro(exp: CallStatementPath, logicalExp: (debugIdentifier: t.Expression) => t.Expression) {
-    const flag = this._debugExpression(exp);
-    exp.replaceWith(this.t.parenthesizedExpression(logicalExp(flag)));
-    exp.scope.crawl();
-  }
-
   _debugExpression(target: NodePath) {
     if (typeof this.isDebug === 'boolean') {
       return this.t.booleanLiteral(this.isDebug);
@@ -244,26 +235,25 @@ export default class Builder {
 
   _buildLogicalExpressions(
     identifiers: t.Expression[],
-    callExpression: t.Expression
-  ): (debugIdentifier: t.Expression) => t.Expression {
+    callExpression: t.Expression,
+    debugIdentifier: t.Expression
+  ): t.Expression {
     let t = this.t;
 
-    return (debugIdentifier: t.Expression) => {
-      identifiers.unshift(debugIdentifier);
-      identifiers.push(callExpression);
-      let logicalExpressions;
+    identifiers.unshift(debugIdentifier);
+    identifiers.push(callExpression);
+    let logicalExpressions;
 
-      for (let i = 0; i < identifiers.length; i++) {
-        let left = identifiers[i];
-        let right = identifiers[i + 1];
-        if (!logicalExpressions) {
-          logicalExpressions = t.logicalExpression('&&', left, right);
-        } else if (right) {
-          logicalExpressions = t.logicalExpression('&&', logicalExpressions, right);
-        }
+    for (let i = 0; i < identifiers.length; i++) {
+      let left = identifiers[i];
+      let right = identifiers[i + 1];
+      if (!logicalExpressions) {
+        logicalExpressions = t.logicalExpression('&&', left, right);
+      } else if (right) {
+        logicalExpressions = t.logicalExpression('&&', logicalExpressions, right);
       }
+    }
 
-      return logicalExpressions!;
-    };
+    return t.parenthesizedExpression(logicalExpressions!);
   }
 }