Merge pull request #617 from saschanaz/promise-resolve

Unwrap Promise from param types

Author: sandersn

baselines/dom.generated.d.ts

@@ -11099,7 +11099,7 @@ declare var PaymentRequest: {
 
 /** The PaymentRequestUpdateEvent interface of the the Payment Request API enables a web page to update the details of a PaymentRequest in response to a user action. */
 interface PaymentRequestUpdateEvent extends Event {
-    updateWith(detailsPromise: Promise<PaymentDetailsUpdate>): void;
+    updateWith(detailsPromise: PaymentDetailsUpdate | Promise<PaymentDetailsUpdate>): void;
 }
 
 declare var PaymentRequestUpdateEvent: {

baselines/webworker.generated.d.ts

@@ -1285,7 +1285,7 @@ declare var EventTarget: {
 
 /** The ExtendableEvent interface extends the lifetime of the install and activate events dispatched on the global scope as part of the service worker lifecycle. This ensures that any functional events (like FetchEvent) are not dispatched until it upgrades database schemas and deletes the outdated cache entries. */
 interface ExtendableEvent extends Event {
-    waitUntil(f: Promise<any>): void;
+    waitUntil(f: any): void;
 }
 
 declare var ExtendableEvent: {
@@ -1314,7 +1314,7 @@ interface FetchEvent extends ExtendableEvent {
     readonly request: Request;
     readonly resultingClientId: string;
     readonly targetClientId: string;
-    respondWith(r: Promise<Response>): void;
+    respondWith(r: Response | Promise<Response>): void;
 }
 
 declare var FetchEvent: {

src/emitter.ts

@@ -355,7 +355,7 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
         return obj.nullable ? makeNullable(resolvedType) : resolvedType;
     }
 
-    function nameWithForwardedTypes (i: Browser.Interface) {
+    function nameWithForwardedTypes(i: Browser.Interface) {
         const typeParameters = i["type-parameters"];
 
         if (!typeParameters) return i.name;
@@ -389,7 +389,7 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
     }
 
     function processInterfaceType(i: Browser.Interface | Browser.Dictionary | Browser.CallbackFunction, name: string) {
-        function typeParameterWithDefault (type: Browser.TypeParameter) {
+        function typeParameterWithDefault(type: Browser.TypeParameter) {
             return `${type.name}`
                 + (type.extends ? ` extends ${type.extends}` : ``)
                 + (type.default ? ` = ${type.default}` : ``)
@@ -497,6 +497,9 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
     /// Generate the parameters string for function signatures
     function paramsToString(ps: Browser.Param[]) {
         function paramToString(p: Browser.Param) {
+            if (p.type === "Promise" && !Array.isArray(p.subtype)) {
+                p = { name: p.name, type: [p.subtype!, p] }
+            }
             const isOptional = !p.variadic && p.optional;
             const pType = isOptional ? convertDomTypeToTsType(p) : convertDomTypeToNullableTsType(p);
             const variadicParams = p.variadic && pType.indexOf('|') !== -1;
@@ -1071,9 +1074,6 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
             .forEach(i => emitCallBackInterface(i));
         emitNonCallbackInterfaces();
 
-        // // Add missed interface definition from the spec
-        // InputJson.getAddedItems InputJson.Interface flavor |> Array.iter EmitAddedInterface
-
         printer.printLine("declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;");
         printer.printLine("");