Remove hardcoded emitAddOrRemoveEventListener

Author: nojaf

src/CSSFontLoadingAPI/FontFaceSet.res

@@ -19,31 +19,11 @@ The event listener is appended to target's event listener list and is not append
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
 */
 @send
-external addEventListener: (fontFaceSet, eventType, eventListener<'event>) => unit =
-  "addEventListener"
-
-/**
-Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.
-
-The options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.
-
-When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
-
-When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.
-
-When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
-
-If an AbortSignal is passed for options's signal, then the event listener will be removed when signal is aborted.
-
-The event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
-*/
-@send
-external addEventListenerWithOptions: (
+external addEventListener: (
   fontFaceSet,
-  eventType,
-  eventListener<'event>,
-  addEventListenerOptions,
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: addEventListenerOptions=?,
 ) => unit = "addEventListener"
 
 /**
@@ -63,44 +43,36 @@ The event listener is appended to target's event listener list and is not append
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
 */
 @send
-external addEventListenerWithUseCapture: (
+external addEventListener2: (
   fontFaceSet,
-  eventType,
-  eventListener<'event>,
-  bool,
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: bool=?,
 ) => unit = "addEventListener"
 
 /**
 Removes the event listener in target's event listener list with the same type, callback, and options.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
 */
 @send
-external removeEventListener: (fontFaceSet, eventType, eventListener<'event>) => unit =
-  "addEventListener"
-
-/**
-Removes the event listener in target's event listener list with the same type, callback, and options.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
-*/
-@send
-external removeEventListenerWithOptions: (
+external removeEventListener: (
   fontFaceSet,
-  eventType,
-  eventListener<'event>,
-  eventListenerOptions,
-) => unit = "addEventListener"
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: eventListenerOptions=?,
+) => unit = "removeEventListener"
 
 /**
 Removes the event listener in target's event listener list with the same type, callback, and options.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
 */
 @send
-external removeEventListenerWithUseCapture: (
+external removeEventListener2: (
   fontFaceSet,
-  eventType,
-  eventListener<'event>,
-  bool,
-) => unit = "addEventListener"
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: bool=?,
+) => unit = "removeEventListener"
 
 /**
 Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.

src/CanvasAPI/OffscreenCanvas.res

@@ -28,31 +28,11 @@ The event listener is appended to target's event listener list and is not append
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
 */
 @send
-external addEventListener: (offscreenCanvas, eventType, eventListener<'event>) => unit =
-  "addEventListener"
-
-/**
-Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.
-
-The options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.
-
-When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
-
-When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.
-
-When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
-
-If an AbortSignal is passed for options's signal, then the event listener will be removed when signal is aborted.
-
-The event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
-*/
-@send
-external addEventListenerWithOptions: (
+external addEventListener: (
   offscreenCanvas,
-  eventType,
-  eventListener<'event>,
-  addEventListenerOptions,
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: addEventListenerOptions=?,
 ) => unit = "addEventListener"
 
 /**
@@ -72,44 +52,36 @@ The event listener is appended to target's event listener list and is not append
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
 */
 @send
-external addEventListenerWithUseCapture: (
+external addEventListener2: (
   offscreenCanvas,
-  eventType,
-  eventListener<'event>,
-  bool,
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: bool=?,
 ) => unit = "addEventListener"
 
 /**
 Removes the event listener in target's event listener list with the same type, callback, and options.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
 */
 @send
-external removeEventListener: (offscreenCanvas, eventType, eventListener<'event>) => unit =
-  "addEventListener"
-
-/**
-Removes the event listener in target's event listener list with the same type, callback, and options.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
-*/
-@send
-external removeEventListenerWithOptions: (
+external removeEventListener: (
   offscreenCanvas,
-  eventType,
-  eventListener<'event>,
-  eventListenerOptions,
-) => unit = "addEventListener"
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: eventListenerOptions=?,
+) => unit = "removeEventListener"
 
 /**
 Removes the event listener in target's event listener list with the same type, callback, and options.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
 */
 @send
-external removeEventListenerWithUseCapture: (
+external removeEventListener2: (
   offscreenCanvas,
-  eventType,
-  eventListener<'event>,
-  bool,
-) => unit = "addEventListener"
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: bool=?,
+) => unit = "removeEventListener"
 
 /**
 Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.

src/ChannelMessagingAPI/MessagePort.res

@@ -20,31 +20,11 @@ The event listener is appended to target's event listener list and is not append
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
 */
 @send
-external addEventListener: (messagePort, eventType, eventListener<'event>) => unit =
-  "addEventListener"
-
-/**
-Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.
-
-The options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.
-
-When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
-
-When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.
-
-When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
-
-If an AbortSignal is passed for options's signal, then the event listener will be removed when signal is aborted.
-
-The event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
-*/
-@send
-external addEventListenerWithOptions: (
+external addEventListener: (
   messagePort,
-  eventType,
-  eventListener<'event>,
-  addEventListenerOptions,
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: addEventListenerOptions=?,
 ) => unit = "addEventListener"
 
 /**
@@ -64,44 +44,36 @@ The event listener is appended to target's event listener list and is not append
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
 */
 @send
-external addEventListenerWithUseCapture: (
+external addEventListener2: (
   messagePort,
-  eventType,
-  eventListener<'event>,
-  bool,
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: bool=?,
 ) => unit = "addEventListener"
 
 /**
 Removes the event listener in target's event listener list with the same type, callback, and options.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
 */
 @send
-external removeEventListener: (messagePort, eventType, eventListener<'event>) => unit =
-  "addEventListener"
-
-/**
-Removes the event listener in target's event listener list with the same type, callback, and options.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
-*/
-@send
-external removeEventListenerWithOptions: (
+external removeEventListener: (
   messagePort,
-  eventType,
-  eventListener<'event>,
-  eventListenerOptions,
-) => unit = "addEventListener"
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: eventListenerOptions=?,
+) => unit = "removeEventListener"
 
 /**
 Removes the event listener in target's event listener list with the same type, callback, and options.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
 */
 @send
-external removeEventListenerWithUseCapture: (
+external removeEventListener2: (
   messagePort,
-  eventType,
-  eventListener<'event>,
-  bool,
-) => unit = "addEventListener"
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: bool=?,
+) => unit = "removeEventListener"
 
 /**
 Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.

src/ClipboardAPI/Clipboard.res

@@ -19,31 +19,11 @@ The event listener is appended to target's event listener list and is not append
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
 */
 @send
-external addEventListener: (clipboard, eventType, eventListener<'event>) => unit =
-  "addEventListener"
-
-/**
-Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.
-
-The options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.
-
-When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
-
-When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.
-
-When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
-
-If an AbortSignal is passed for options's signal, then the event listener will be removed when signal is aborted.
-
-The event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
-*/
-@send
-external addEventListenerWithOptions: (
+external addEventListener: (
   clipboard,
-  eventType,
-  eventListener<'event>,
-  addEventListenerOptions,
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: addEventListenerOptions=?,
 ) => unit = "addEventListener"
 
 /**
@@ -63,44 +43,36 @@ The event listener is appended to target's event listener list and is not append
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
 */
 @send
-external addEventListenerWithUseCapture: (
+external addEventListener2: (
   clipboard,
-  eventType,
-  eventListener<'event>,
-  bool,
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: bool=?,
 ) => unit = "addEventListener"
 
 /**
 Removes the event listener in target's event listener list with the same type, callback, and options.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
 */
 @send
-external removeEventListener: (clipboard, eventType, eventListener<'event>) => unit =
-  "addEventListener"
-
-/**
-Removes the event listener in target's event listener list with the same type, callback, and options.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
-*/
-@send
-external removeEventListenerWithOptions: (
+external removeEventListener: (
   clipboard,
-  eventType,
-  eventListener<'event>,
-  eventListenerOptions,
-) => unit = "addEventListener"
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: eventListenerOptions=?,
+) => unit = "removeEventListener"
 
 /**
 Removes the event listener in target's event listener list with the same type, callback, and options.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
 */
 @send
-external removeEventListenerWithUseCapture: (
+external removeEventListener2: (
   clipboard,
-  eventType,
-  eventListener<'event>,
-  bool,
-) => unit = "addEventListener"
+  ~type_: eventType,
+  ~callback: eventListener<'event>,
+  ~options: bool=?,
+) => unit = "removeEventListener"
 
 /**
 Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.