add Console types

microsoft · Apr 24, 2018 · f3e2895 · f3e2895
1 parent ae4137a
commit f3e2895
Show file tree

Hide file tree

Showing 11 changed files with 170 additions and 165 deletions.
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -3252,41 +3252,6 @@ interface ConcatParams extends Algorithm {
     publicInfo?: Uint8Array;
 }
 
-interface Console {
-    memory: any;
-    assert(condition?: boolean, message?: string, ...data: any[]): void;
-    clear(): void;
-    count(label?: string): void;
-    debug(message?: any, ...optionalParams: any[]): void;
-    dir(value?: any, ...optionalParams: any[]): void;
-    dirxml(value: any): void;
-    error(message?: any, ...optionalParams: any[]): void;
-    exception(message?: string, ...optionalParams: any[]): void;
-    group(groupTitle?: string, ...optionalParams: any[]): void;
-    groupCollapsed(groupTitle?: string, ...optionalParams: any[]): void;
-    groupEnd(): void;
-    info(message?: any, ...optionalParams: any[]): void;
-    log(message?: any, ...optionalParams: any[]): void;
-    markTimeline(label?: string): void;
-    msIsIndependentlyComposed(element: Element): boolean;
-    profile(reportName?: string): void;
-    profileEnd(): void;
-    select(element: Element): void;
-    table(...tabularData: any[]): void;
-    time(label?: string): void;
-    timeEnd(label?: string): void;
-    timeStamp(label?: string): void;
-    timeline(label?: string): void;
-    timelineEnd(label?: string): void;
-    trace(message?: any, ...optionalParams: any[]): void;
-    warn(message?: any, ...optionalParams: any[]): void;
-}
-
-declare var Console: {
-    prototype: Console;
-    new(): Console;
-};
-
 interface ConvolverNode extends AudioNode {
     buffer: AudioBuffer | null;
     normalize: boolean;
@@ -15428,7 +15393,7 @@ interface WindowEventMap extends GlobalEventHandlersEventMap {
     "waiting": Event;
 }
 
-interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64, GlobalFetch {
+interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, GlobalEventHandlers, IDBEnvironment, WindowBase64, GlobalFetch {
     Blob: typeof Blob;
     URL: typeof URL;
     URLSearchParams: typeof URLSearchParams;
@@ -15636,10 +15601,6 @@ interface WindowBase64 {
     btoa(rawString: string): string;
 }
 
-interface WindowConsole {
-    readonly console: Console;
-}
-
 interface WindowEventHandlersEventMap {
     "afterprint": Event;
     "beforeprint": Event;
@@ -15954,6 +15915,26 @@ declare var webkitRTCPeerConnection: {
     new(configuration: RTCConfiguration): webkitRTCPeerConnection;
 };
 
+declare namespace console {
+    function assert(condition?: boolean, ...data: any[]): void;
+    function clear(): void;
+    function count(label?: string): void;
+    function debug(...data: any[]): void;
+    function dir(item: any, options?: any): void;
+    function dirxml(...data: any[]): void;
+    function error(...data: any[]): void;
+    function group(...data: any[]): void;
+    function groupCollapsed(...data: any[]): void;
+    function groupEnd(): void;
+    function info(...data: any[]): void;
+    function log(...data: any[]): void;
+    function table(tabularData: any, properties?: string[]): void;
+    function time(label?: string): void;
+    function timeEnd(label?: string): void;
+    function trace(...data: any[]): void;
+    function warn(...data: any[]): void;
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface DecodeErrorCallback {
@@ -16461,7 +16442,6 @@ declare function setImmediate(handler: (...args: any[]) => void): number;
 declare function setImmediate(handler: any, ...args: any[]): number;
 declare var sessionStorage: Storage;
 declare var localStorage: Storage;
-declare var console: Console;
 declare var onpointercancel: ((this: Window, ev: PointerEvent) => any) | null;
 declare var onpointerdown: ((this: Window, ev: PointerEvent) => any) | null;
 declare var onpointerenter: ((this: Window, ev: PointerEvent) => any) | null;

diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -408,41 +408,6 @@ interface ConcatParams extends Algorithm {
     publicInfo?: Uint8Array;
 }
 
-interface Console {
-    memory: any;
-    assert(condition?: boolean, message?: string, ...data: any[]): void;
-    clear(): void;
-    count(label?: string): void;
-    debug(message?: any, ...optionalParams: any[]): void;
-    dir(value?: any, ...optionalParams: any[]): void;
-    dirxml(value: any): void;
-    error(message?: any, ...optionalParams: any[]): void;
-    exception(message?: string, ...optionalParams: any[]): void;
-    group(groupTitle?: string, ...optionalParams: any[]): void;
-    groupCollapsed(groupTitle?: string, ...optionalParams: any[]): void;
-    groupEnd(): void;
-    info(message?: any, ...optionalParams: any[]): void;
-    log(message?: any, ...optionalParams: any[]): void;
-    markTimeline(label?: string): void;
-    msIsIndependentlyComposed(element: object): boolean;
-    profile(reportName?: string): void;
-    profileEnd(): void;
-    select(element: object): void;
-    table(...tabularData: any[]): void;
-    time(label?: string): void;
-    timeEnd(label?: string): void;
-    timeStamp(label?: string): void;
-    timeline(label?: string): void;
-    timelineEnd(label?: string): void;
-    trace(message?: any, ...optionalParams: any[]): void;
-    warn(message?: any, ...optionalParams: any[]): void;
-}
-
-declare var Console: {
-    prototype: Console;
-    new(): Console;
-};
-
 interface CryptoKey {
     readonly algorithm: KeyAlgorithm;
     readonly extractable: boolean;
@@ -1874,10 +1839,6 @@ declare var WindowClient: {
     new(): WindowClient;
 };
 
-interface WindowConsole {
-    readonly console: Console;
-}
-
 interface WorkerEventMap extends AbstractWorkerEventMap {
     "message": MessageEvent;
 }
@@ -1902,7 +1863,7 @@ interface WorkerGlobalScopeEventMap {
     "error": ErrorEvent;
 }
 
-interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, GlobalFetch {
+interface WorkerGlobalScope extends EventTarget, WorkerUtils, GlobalFetch {
     readonly caches: CacheStorage;
     readonly isSecureContext: boolean;
     readonly location: WorkerLocation;
@@ -2049,6 +2010,26 @@ declare var XMLHttpRequestUpload: {
     new(): XMLHttpRequestUpload;
 };
 
+declare namespace console {
+    function assert(condition?: boolean, ...data: any[]): void;
+    function clear(): void;
+    function count(label?: string): void;
+    function debug(...data: any[]): void;
+    function dir(item: any, options?: any): void;
+    function dirxml(...data: any[]): void;
+    function error(...data: any[]): void;
+    function group(...data: any[]): void;
+    function groupCollapsed(...data: any[]): void;
+    function groupEnd(): void;
+    function info(...data: any[]): void;
+    function log(...data: any[]): void;
+    function table(tabularData: any, properties?: string[]): void;
+    function time(label?: string): void;
+    function timeEnd(label?: string): void;
+    function trace(...data: any[]): void;
+    function warn(...data: any[]): void;
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -2097,7 +2078,6 @@ declare function setInterval(handler: any, timeout?: any, ...args: any[]): numbe
 declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
-declare var console: Console;
 declare function fetch(input?: Request | string, init?: RequestInit): Promise<Response>;
 declare function addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;

diff --git a/inputfiles/idl/Console.widl b/inputfiles/idl/Console.widl
@@ -0,0 +1,25 @@
+[Exposed=(Window,Worker,Worklet)]
+namespace console { // but see namespace object requirements below
+  // Logging
+  void assert(optional boolean condition = false, any... data);
+  void clear();
+  void count(optional DOMString label = "default");
+  void debug(any... data);
+  void error(any... data);
+  void info(any... data);
+  void log(any... data);
+  void table(any tabularData, optional sequence<DOMString> properties);
+  void trace(any... data);
+  void warn(any... data);
+  void dir(any item, optional object? options);
+  void dirxml(any... data);
+
+  // Grouping
+  void group(any... data);
+  void groupCollapsed(any... data);
+  void groupEnd();
+
+  // Timing
+  void time(optional DOMString label = "default");
+  void timeEnd(optional DOMString label = "default");
+};
diff --git a/inputfiles/idlSources.json b/inputfiles/idlSources.json
@@ -1,4 +1,8 @@
 [
+    {
+        "url": "https://console.spec.whatwg.org/",
+        "title": "Console"
+    },
     {
         "url": "https://encoding.spec.whatwg.org/",
         "title": "Encoding"

diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -248,7 +248,23 @@
                         }
                     }
                 },
-                "overide-index-signatures": []
+                "overide-index-signatures": [],
+                "override-implements": [
+                    "WindowTimers",
+                    "WindowSessionStorage",
+                    "WindowLocalStorage",
+                    "GlobalEventHandlers",
+                    "IDBEnvironment",
+                    "WindowBase64",
+                    "GlobalFetch"
+                ]
+            },
+            "WorkerGlobalScope": {
+                "name": "WorkerGlobalScope",
+                "override-implements": [
+                    "WorkerUtils",
+                    "GlobalFetch"
+                ]
             },
             "Document": {
                 "name": "Document",
@@ -878,73 +894,6 @@
                     }
                 }
             },
-            "Console": {
-                "name": "Console",
-                "methods": {
-                    "method": {
-                        "debug": {
-                            "name": "debug",
-                            "override-signatures": [
-                                "debug(message?: any, ...optionalParams: any[]): void"
-                            ]
-                        },
-                        "dir": {
-                            "name": "dir",
-                            "override-signatures": [
-                                "dir(value?: any, ...optionalParams: any[]): void"
-                            ]
-                        },
-                        "dirxml": {
-                            "name": "dirxml",
-                            "override-signatures": [
-                                "dirxml(value: any): void"
-                            ]
-                        },
-                        "error": {
-                            "name": "error",
-                            "override-signatures": [
-                                "error(message?: any, ...optionalParams: any[]): void"
-                            ]
-                        },
-                        "info": {
-                            "name": "info",
-                            "override-signatures": [
-                                "info(message?: any, ...optionalParams: any[]): void"
-                            ]
-                        },
-                        "log": {
-                            "name": "log",
-                            "override-signatures": [
-                                "log(message?: any, ...optionalParams: any[]): void"
-                            ]
-                        },
-                        "warn": {
-                            "name": "warn",
-                            "override-signatures": [
-                                "warn(message?: any, ...optionalParams: any[]): void"
-                            ]
-                        },
-                        "group": {
-                            "name": "group",
-                            "override-signatures": [
-                                "group(groupTitle?: string, ...optionalParams: any[]): void"
-                            ]
-                        },
-                        "groupCollapsed": {
-                            "name": "groupCollapsed",
-                            "override-signatures": [
-                                "groupCollapsed(groupTitle?: string, ...optionalParams: any[]): void"
-                            ]
-                        },
-                        "trace": {
-                            "name": "trace",
-                            "override-signatures": [
-                                "trace(message?: any, ...optionalParams: any[]): void"
-                            ]
-                        }
-                    }
-                }
-            },
             "FormData": {
                 "name": "FormData",
                 "methods": {

diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json
@@ -6,7 +6,8 @@
     },
     "mixins": {
         "mixin": {
-            "XMLHttpRequestEventTarget": null
+            "XMLHttpRequestEventTarget": null,
+            "WindowConsole": null
         }
     },
     "callback-interfaces": {
@@ -20,6 +21,7 @@
     },
     "interfaces": {
         "interface": {
+            "Console": null,
             "FileReaderProgressEvent": null,
             "HTMLElement": {
                 "methods": {
@@ -51,6 +53,11 @@
             }
         }
     },
+    "namespaces": {
+        "namespace": {
+
+        }
+    },
     "dictionaries": {
         "dictionary": {
             "ObjectURLOptions": null,