JavaScript: Recognise Electron browser objects based on TypeScript types when available.

javascript/ql/src/semmle/javascript/frameworks/Electron.qll

@@ -11,7 +11,7 @@ module Electron {
   /**
    * A data flow node that may contain a `BrowserWindow` or `BrowserView` object.
    */
-  abstract private class BrowserObject extends DataFlow::Node { }
+  abstract class BrowserObject extends DataFlow::Node { }
 
   /**
    * An instantiation of `BrowserWindow` or `BrowserView`.
@@ -45,6 +45,17 @@ module Electron {
     BrowserView() { this = DataFlow::moduleMember("electron", "BrowserView").getAnInstantiation() }
   }
 
+  /**
+   * An expression of type `BrowserWindow` or `BrowserView`.
+   */
+  private class BrowserObjectByType extends BrowserObject {
+    BrowserObjectByType() {
+      exists (string tp | tp = "BrowserWindow" or tp = "BrowserView" |
+        asExpr().getType().hasUnderlyingType("electron", tp)
+      )
+    }
+  }
+
   /**
    * A Node.js-style HTTP or HTTPS request made using an Electron module.
    */

javascript/ql/test/library-tests/frameworks/Electron/BrowserObject.expected

@@ -0,0 +1,6 @@
+| electron.d.ts:2:16:2:28 | BrowserWindow |
+| electron.d.ts:3:16:3:26 | BrowserView |
+| electron.js:3:1:3:39 | new Bro ... s: {}}) |
+| electron.js:4:1:4:37 | new Bro ... s: {}}) |
+| electron.ts:3:12:3:13 | bw |
+| electron.ts:3:40:3:41 | bv |

javascript/ql/test/library-tests/frameworks/Electron/BrowserObject.ql

@@ -0,0 +1,4 @@
+import javascript
+
+from Electron::BrowserObject obj
+select obj

javascript/ql/test/library-tests/frameworks/Electron/electron.d.ts

@@ -0,0 +1,8 @@
+declare namespace Electron {
+  export class BrowserWindow { }
+  export class BrowserView { }
+}
+
+declare module 'electron' {
+  export = Electron;
+}

javascript/ql/test/library-tests/frameworks/Electron/electron.ts

@@ -0,0 +1,4 @@
+///<reference path="./electron.d.ts"/>
+
+function f(bw: Electron.BrowserWindow, bv: Electron.BrowserView) {
+}

javascript/ql/test/library-tests/frameworks/Electron/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": ["."]
+}