refactor EventEmitter model to use the ::Range pattern

Author: erik-krogh

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

@@ -89,7 +89,7 @@ module Electron {
     /**
      * A model for the Main and Renderer process in an Electron app.
      */
-    abstract class Process extends EventEmitter::EventEmitter { }
+    abstract class Process extends EventEmitter::EventEmitterRange::Range { }
 
     /**
      * An instance of the Main process of an Electron app.
@@ -100,83 +100,78 @@ module Electron {
     }
 
     /**
-     * An instance of the renderer process of an Electron app. 
+     * An instance of the renderer process of an Electron app.
      */
     class RendererProcess extends Process {
       RendererProcess() { this = renderer() }
     }
-    
+
     /**
-     * The `sender` property of the event in an IPC event handler. 
+     * The `sender` property of the event in an IPC event handler.
      * This sender is used to send a response back from the main process to the renderer.
      */
     class ProcessSender extends Process {
       ProcessSender() {
-        exists(IPCSendRegistration reg | reg.getEmitter() instanceof MainProcess | 
-         this = reg.getABoundCallbackParameter(1, 0).getAPropertyRead("sender")
+        exists(IPCSendRegistration reg | reg.getEmitter() instanceof MainProcess |
+          this = reg.getABoundCallbackParameter(1, 0).getAPropertyRead("sender")
         )
       }
     }
-    
+
     /**
      * A registration of an Electron IPC event handler.
-     * Does mostly the same as an EventEmitter event handler, 
-     * except that values can be returned through the `event.returnValue` property. 
+     * Does mostly the same as an EventEmitter event handler,
+     * except that values can be returned through the `event.returnValue` property.
      */
-    class IPCSendRegistration extends EventEmitter::EventRegistration, DataFlow::MethodCallNode {
+    class IPCSendRegistration extends EventEmitter::EventRegistration::Range,
+      DataFlow::MethodCallNode {
       override Process emitter;
-      
-      IPCSendRegistration() {
-        this = emitter.ref().getAMethodCall("on")
-      }
-      
-      override string getChannel() {
-        this.getArgument(0).mayHaveStringValue(result)
-      }
-      
+
+      IPCSendRegistration() { this = emitter.ref().getAMethodCall("on") }
+
+      override string getChannel() { this.getArgument(0).mayHaveStringValue(result) }
+
       override DataFlow::Node getEventHandlerParameter(int i) {
-        result = this.getABoundCallbackParameter(1, i + 1) 
+        result = this.getABoundCallbackParameter(1, i + 1)
       }
-      
+
       override DataFlow::Node getAReturnedValue() {
         result = this.getABoundCallbackParameter(1, 0).getAPropertyWrite("returnValue").getRhs()
       }
-      
+
       override predicate canReturnTo(EventEmitter::EventDispatch dispatch) {
         dispatch.(DataFlow::InvokeNode).getCalleeName() = "sendSync"
       }
     }
-    
+
     /**
-     * A dispatch of an IPC event. 
+     * A dispatch of an IPC event.
      * An IPC event is sent from the Renderer to the Main process.
-     * And a value can be returned through the `returnValue` property of the event (first parameter in the callback). 
+     * And a value can be returned through the `returnValue` property of the event (first parameter in the callback).
      */
-    class IPCDispatch extends EventEmitter::EventDispatch, DataFlow::InvokeNode {
+    class IPCDispatch extends EventEmitter::EventDispatch::Range, DataFlow::InvokeNode {
       override Process emitter;
-      
+
       IPCDispatch() {
-        exists(string methodName | methodName = "sendSync" or methodName = "send" | 
+        exists(string methodName | methodName = "sendSync" or methodName = "send" |
           this = emitter.ref().getAMemberCall(methodName)
         )
       }
-      
-      override string getChannel() {
-        this.getArgument(0).mayHaveStringValue(result)
-      }
-      
+
+      override string getChannel() { this.getArgument(0).mayHaveStringValue(result) }
+
       /**
-       * Gets the `i`th dispatched argument to the event handler. 
-       * The 0th parameter in the callback is a event generated by the IPC system, 
-       * therefore these arguments start at 1. 
+       * Gets the `i`th dispatched argument to the event handler.
+       * The 0th parameter in the callback is a event generated by the IPC system,
+       * therefore these arguments start at 1.
        */
       override DataFlow::Node getDispatchedArgument(int i) {
-        i >= 1 and 
+        i >= 1 and
         result = getArgument(i)
       }
-      
+
       /**
-       * Holds if this dispatch can send an event to the given EventRegistration destination. 
+       * Holds if this dispatch can send an event to the given EventRegistration destination.
        */
       override predicate canSendTo(EventEmitter::EventRegistration destination) {
         this.getEmitter() instanceof RendererProcess and