From d3063fc5f701b745934c6d48b560c5e96763f5a3 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 16 Feb 2018 10:17:44 +0900
Subject: [PATCH] add proper parentheses + use any return type

---
 TS.fsx                             | 3 +--
 baselines/dom.generated.d.ts       | 9 +++++----
 baselines/webworker.generated.d.ts | 3 ++-
 inputfiles/addedTypes.json         | 5 +++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/TS.fsx b/TS.fsx
index eef1f373d..651f24ad0 100644
--- a/TS.fsx
+++ b/TS.fsx
@@ -873,8 +873,7 @@ module Emit =
                 let m = i.Methods.Value.Methods.[0]
                 let overload = (GetOverloads (Function.Method m) false).[0]
                 let paramsString = ParamsToString overload.ParamCombinations
-                let returnType = DomTypeToTsType m.Type
-                Pt.Printl "type %s = (%s) => %s | { %s(%s): %s; };" i.Name paramsString returnType m.Name.Value paramsString returnType
+                Pt.Printl "type %s = ((%s) => any) | { %s(%s): any; };" i.Name paramsString m.Name.Value paramsString
                 Pt.Printl ""
 
     let EmitCallBackFunctions flavor =
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
index 480e9f93a..327357103 100644
--- a/baselines/dom.generated.d.ts
+++ b/baselines/dom.generated.d.ts
@@ -1169,13 +1169,13 @@ interface WheelEventInit extends MouseEventInit {
     deltaZ?: number;
 }
 
-type EventListener = (evt: Event) => void | { handleEvent(evt: Event): void; };
+type EventListener = ((evt: Event) => any) | { handleEvent(evt: Event): any; };
 
-type WebKitEntriesCallback = (entries: WebKitEntry[]) => void | { handleEvent(entries: WebKitEntry[]): void; };
+type WebKitEntriesCallback = ((entries: WebKitEntry[]) => any) | { handleEvent(entries: WebKitEntry[]): any; };
 
-type WebKitErrorCallback = (err: DOMError) => void | { handleEvent(err: DOMError): void; };
+type WebKitErrorCallback = ((err: DOMError) => any) | { handleEvent(err: DOMError): any; };
 
-type WebKitFileCallback = (file: File) => void | { handleEvent(file: File): void; };
+type WebKitFileCallback = ((file: File) => any) | { handleEvent(file: File): any; };
 
 interface AnalyserNode extends AudioNode {
     fftSize: number;
@@ -15435,6 +15435,7 @@ type InsertPosition = "beforebegin" | "afterbegin" | "beforeend" | "afterend";
 type HeadersInit = Headers | string[][] | { [key: string]: string };
 type AnimationKeyFrame = {offset?: number | null | (number | null)[]} & {[key: string]: string | number | number[] | string[]};
 type OrientationLockType = "any" | "natural" | "portrait" | "landscape" | "portrait-primary" | "portrait-secondary" | "landscape-primary"| "landscape-secondary";
+type EventListenerOrEventListenerObject = EventListener;
 type AppendMode = "segments" | "sequence";
 type AudioContextState = "suspended" | "running" | "closed";
 type BiquadFilterType = "lowpass" | "highpass" | "bandpass" | "lowshelf" | "highshelf" | "peaking" | "notch" | "allpass";
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
index aaec633ed..5ce814504 100644
--- a/baselines/webworker.generated.d.ts
+++ b/baselines/webworker.generated.d.ts
@@ -128,7 +128,7 @@ interface SyncEventInit extends ExtendableEventInit {
     lastChance?: boolean;
 }
 
-type EventListener = (evt: Event) => void | { handleEvent(evt: Event): void; };
+type EventListener = ((evt: Event) => any) | { handleEvent(evt: Event): any; };
 
 interface AudioBuffer {
     readonly duration: number;
@@ -1911,6 +1911,7 @@ type IDBValidKey = number | string | Date | IDBArrayKey;
 type BufferSource = ArrayBuffer | ArrayBufferView;
 type FormDataEntryValue = string | File;
 type HeadersInit = Headers | string[][] | { [key: string]: string };
+type EventListenerOrEventListenerObject = EventListener;
 type IDBCursorDirection = "next" | "nextunique" | "prev" | "prevunique";
 type IDBRequestReadyState = "pending" | "done";
 type IDBTransactionMode = "readonly" | "readwrite" | "versionchange";
diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
index c316e688c..238b5462d 100644
--- a/inputfiles/addedTypes.json
+++ b/inputfiles/addedTypes.json
@@ -3002,5 +3002,10 @@
         "signatures": [
             "unlockOrientation(): void"
         ]
+    },
+    {
+        "kind": "typedef",
+        "name": "EventListenerOrEventListenerObject",
+        "type": "EventListener"
     }
 ]