JS: Recognize 'require' calls in more cases

Author: asger-semmle

javascript/extractor/src/com/semmle/js/extractor/NodeJSDetector.java

@@ -97,8 +97,9 @@ private static boolean isRequireCall(Expression e) {
     if (e instanceof CallExpression) {
       CallExpression call = (CallExpression) e;
       Expression callee = call.getCallee();
-      return (isIdentifier(callee, "require") || isRequireCall(callee))
-          && call.getArguments().size() == 1;
+      if (isIdentifier(callee, "require") && call.getArguments().size() == 1) return true;
+      if (isRequireCall(callee)) return true;
+      return false;
     } else if (e instanceof MemberExpression) {
       return isRequireCall(((MemberExpression) e).getObject());
     } else if (e instanceof AssignmentExpression) {

javascript/extractor/src/com/semmle/js/extractor/test/NodeJSDetectorTests.java

@@ -164,9 +164,8 @@ public void testUMD() {
 
   @Test
   public void amdefine() {
-    // not currently detected
     isNodeJS(
-        "if (typeof define !== 'function') define = require('amdefine')(module, require);", false);
+        "if (typeof define !== 'function') define = require('amdefine')(module, require);", true);
   }
 
   @Test
@@ -202,4 +201,14 @@ public void requireInIf() {
             + "}",
         true);
   }
+
+  @Test
+  public void requireAndCall() {
+    isNodeJS("var foo = require('foo')();", true);
+  }
+
+  @Test
+  public void requireAndCallMethod() {
+    isNodeJS("var foo = require('foo').bar();", true);
+  }
 }