Merge branch 'master' of https://github.com/Microsoft/TSJS-lib-generator

into implicit-iterable
microsoft · May 12, 2017 · 545daec · 545daec
2 parents 605b247 + 0be887a
commit 545daec
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 13 deletions.
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -2288,8 +2288,8 @@ interface Console {
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
     exception(message?: string, ...optionalParams: any[]): void;
-    group(groupTitle?: string): void;
-    groupCollapsed(groupTitle?: string): 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;
@@ -3641,9 +3641,9 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     scrollTo(x: number, y: number): void;
     scrollBy(options?: ScrollToOptions): void;
     scrollBy(x: number, y: number): void;
-    insertAdjacentElement(position: string, insertedElement: Element): Element | null;
-    insertAdjacentHTML(where: string, html: string): void;
-    insertAdjacentText(where: string, text: string): void;
+    insertAdjacentElement(position: InsertPosition, insertedElement: Element): Element | null;
+    insertAdjacentHTML(where: InsertPosition, html: string): void;
+    insertAdjacentText(where: InsertPosition, text: string): void;
     attachShadow(shadowRootInitDict: ShadowRootInit): ShadowRoot;
     addEventListener<K extends keyof ElementEventMap>(type: K, listener: (this: Element, ev: ElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -5725,7 +5725,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Loads and starts playback of a media resource.
       */
-    play(): void;
+    play(): Promise<void>;
     setMediaKeys(mediaKeys: MediaKeys | null): Promise<void>;
     readonly HAVE_CURRENT_DATA: number;
     readonly HAVE_ENOUGH_DATA: number;
@@ -9366,6 +9366,8 @@ interface Response extends Object, Body {
 declare var Response: {
     prototype: Response;
     new(body?: any, init?: ResponseInit): Response;
+    error: () => Response;
+    redirect: (url: string, status?: number) => Response;
 }
 
 interface SVGAElement extends SVGGraphicsElement, SVGURIReference {
@@ -14963,6 +14965,7 @@ type BufferSource = ArrayBuffer | ArrayBufferView;
 type MouseWheelEvent = WheelEvent;
 type ScrollRestoration = "auto" | "manual";
 type FormDataEntryValue = string | File;
+type InsertPosition = "beforebegin" | "afterbegin" | "beforeend" | "afterend";
 type AppendMode = "segments" | "sequence";
 type AudioContextState = "suspended" | "running" | "closed";
 type BiquadFilterType = "lowpass" | "highpass" | "bandpass" | "lowshelf" | "highshelf" | "peaking" | "notch" | "allpass";
@@ -15033,4 +15036,4 @@ type ServiceWorkerState = "installing" | "installed" | "activating" | "activated
 type Transport = "usb" | "nfc" | "ble";
 type VideoFacingModeEnum = "user" | "environment" | "left" | "right";
 type VisibilityState = "hidden" | "visible" | "prerender" | "unloaded";
-type XMLHttpRequestResponseType = "" | "arraybuffer" | "blob" | "document" | "json" | "text";
+type XMLHttpRequestResponseType = "" | "arraybuffer" | "blob" | "document" | "json" | "text";
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -220,8 +220,8 @@ interface Console {
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
     exception(message?: string, ...optionalParams: any[]): void;
-    group(groupTitle?: string): void;
-    groupCollapsed(groupTitle?: string): 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;
@@ -957,6 +957,8 @@ interface Response extends Object, Body {
 declare var Response: {
     prototype: Response;
     new(body?: any, init?: ResponseInit): Response;
+    error: () => Response;
+    redirect: (url: string, status?: number) => Response;
 }
 
 interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
@@ -1838,4 +1840,4 @@ type ServiceWorkerState = "installing" | "installed" | "activating" | "activated
 type VisibilityState = "hidden" | "visible" | "prerender" | "unloaded";
 type XMLHttpRequestResponseType = "" | "arraybuffer" | "blob" | "document" | "json" | "text";
 type ClientType = "window" | "worker" | "sharedworker" | "all";
-type FrameType = "auxiliary" | "top-level" | "nested" | "none";
+type FrameType = "auxiliary" | "top-level" | "nested" | "none";
diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
@@ -1219,19 +1219,19 @@
         "kind": "method",
         "interface": "Element",
         "name": "insertAdjacentElement",
-        "signatures": ["insertAdjacentElement(position: string, insertedElement: Element): Element | null"]
+        "signatures": ["insertAdjacentElement(position: InsertPosition, insertedElement: Element): Element | null"]
     },
     {
         "kind": "method",
         "interface": "Element",
         "name": "insertAdjacentHTML",
-        "signatures": ["insertAdjacentHTML(where: string, html: string): void"]
+        "signatures": ["insertAdjacentHTML(where: InsertPosition, html: string): void"]
     },
     {
         "kind": "method",
         "interface": "Element",
         "name": "insertAdjacentText",
-        "signatures": ["insertAdjacentText(where: string, text: string): void"]
+        "signatures": ["insertAdjacentText(where: InsertPosition, text: string): void"]
     },
     {
         "kind": "property",
@@ -1616,5 +1616,11 @@
             "name": "changedTouches?",
             "type": "Touch[]"
         }]
+    },
+    {
+        "kind": "typedef",
+        "name": "InsertPosition",
+        "flavor": "Web",
+        "type": "\"beforebegin\" | \"afterbegin\" | \"beforeend\" | \"afterend\""
     }
 ]
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -1,4 +1,13 @@
  [
+    {
+        "kind": "constructor",
+        "interface": "Response",
+        "signatures": [
+            "new(body?: any, init?: ResponseInit): Response",
+            "error: () => Response",
+            "redirect: (url: string, status?: number) => Response"
+        ]
+    },
     {
         "kind": "constructor",
         "interface": "ErrorEvent",
@@ -324,6 +333,18 @@
         "interface": "Console",
         "name": "warn",
         "signatures": ["warn(message?: any, ...optionalParams: any[]): void"]
+    },
+     {
+        "kind": "method",
+        "interface": "Console",
+        "name": "group",
+        "signatures": ["group(groupTitle?: string, ...optionalParams: any[]): void"]
+    },
+     {
+        "kind": "method",
+        "interface": "Console",
+        "name": "groupCollapsed",
+        "signatures": ["groupCollapsed(groupTitle?: string, ...optionalParams: any[]): void"]
     },
     {
         "kind": "callback",
@@ -1073,5 +1094,13 @@
         "signatures": [
             "new(data?: string): Text"
         ]
+    },
+    {
+        "kind": "method",
+        "interface": "HTMLMediaElement",
+        "name": "play",
+        "signatures": [
+            "play(): Promise<void>"
+        ]
     }
  ]