Fix ECMAScript to IDL Promise<T> type conversion

This fixes a number of bugs: * Rejected promises would be converted to fulfilled promises. * Timing would not be correct due to using .then() This removes the type conversion based on T that was previously performed, since that does not happen in the Web IDL specification until the time of the "react" algorithm at https://heycam.github.io/webidl/#dfn-perform-steps-once-promise-is-settled (which, for example, is never called when a Promise<T> is used as a return type).
jsdom · May 5, 2020 · 2aab61c · 2aab61c
1 parent 7d45dfc
commit 2aab61c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 64 deletions.
diff --git a/lib/types.js b/lib/types.js
@@ -328,24 +328,7 @@ function generateTypeConversion(ctx, name, idlType, argAttrs = [], parentName, e
   }
 
   function generatePromise() {
-    let handler;
-    if (idlType.idlType[0].idlType === "void") {
-      // Do nothing.
-      handler = "";
-    } else {
-      const conv = generateTypeConversion(ctx, "value", idlType.idlType[0], [], parentName,
-        `${errPrefix} + " promise value"`);
-      requires.merge(conv.requires);
-      handler = `
-        ${conv.body}
-        return value;
-      `;
-    }
-    str += `
-      ${name} = Promise.resolve(${name}).then(value => {
-        ${handler}
-      }, reason => reason);
-    `;
+    str += `${name} = new Promise(resolve => resolve(${name}));`;
   }
 
   function generateFrozenArray() {

diff --git a/test/__snapshots__/test.js.snap b/test/__snapshots__/test.js.snap
@@ -27,15 +27,7 @@ exports.convert = function convert(value, { context = \\"The provided value\\" }
 
       let callResult = Reflect.apply(X, thisArg, []);
 
-      callResult = Promise.resolve(callResult).then(
-        value => {
-          value = conversions[\\"any\\"](value, { context: context + \\" promise value\\" });
-
-          return value;
-        },
-        reason => reason
-      );
-
+      callResult = new Promise(resolve => resolve(callResult));
       return callResult;
     } catch (err) {
       return Promise.reject(err);
@@ -3695,10 +3687,7 @@ exports.install = (globalObject, globalNames) => {
       const args = [];
       {
         let curArg = arguments[0];
-        curArg = Promise.resolve(curArg).then(
-          value => {},
-          reason => reason
-        );
+        curArg = new Promise(resolve => resolve(curArg));
         args.push(curArg);
       }
       return esValue[implSymbol].voidPromiseConsumer(...args);
@@ -3720,16 +3709,7 @@ exports.install = (globalObject, globalNames) => {
       const args = [];
       {
         let curArg = arguments[0];
-        curArg = Promise.resolve(curArg).then(
-          value => {
-            value = conversions[\\"double\\"](value, {
-              context: \\"Failed to execute 'promiseConsumer' on 'PromiseTypes': parameter 1\\" + \\" promise value\\"
-            });
-
-            return value;
-          },
-          reason => reason
-        );
+        curArg = new Promise(resolve => resolve(curArg));
         args.push(curArg);
       }
       return esValue[implSymbol].promiseConsumer(...args);
@@ -8885,15 +8865,7 @@ exports.convert = function convert(value, { context = \\"The provided value\\" }
 
       let callResult = Reflect.apply(X, thisArg, []);
 
-      callResult = Promise.resolve(callResult).then(
-        value => {
-          value = conversions[\\"any\\"](value, { context: context + \\" promise value\\" });
-
-          return value;
-        },
-        reason => reason
-      );
-
+      callResult = new Promise(resolve => resolve(callResult));
       return callResult;
     } catch (err) {
       return Promise.reject(err);
@@ -12511,10 +12483,7 @@ exports.install = (globalObject, globalNames) => {
       const args = [];
       {
         let curArg = arguments[0];
-        curArg = Promise.resolve(curArg).then(
-          value => {},
-          reason => reason
-        );
+        curArg = new Promise(resolve => resolve(curArg));
         args.push(curArg);
       }
       return esValue[implSymbol].voidPromiseConsumer(...args);
@@ -12536,16 +12505,7 @@ exports.install = (globalObject, globalNames) => {
       const args = [];
       {
         let curArg = arguments[0];
-        curArg = Promise.resolve(curArg).then(
-          value => {
-            value = conversions[\\"double\\"](value, {
-              context: \\"Failed to execute 'promiseConsumer' on 'PromiseTypes': parameter 1\\" + \\" promise value\\"
-            });
-
-            return value;
-          },
-          reason => reason
-        );
+        curArg = new Promise(resolve => resolve(curArg));
         args.push(curArg);
       }
       return esValue[implSymbol].promiseConsumer(...args);