Fix bug in zero-args calls to the impl

This was introduced in 4dd82b0.
jsdom · Apr 29, 2017 · 5013091 · 5013091
1 parent 42d1968
commit 5013091
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/constructs/operation.js b/lib/constructs/operation.js
@@ -53,22 +53,23 @@ Operation.prototype.generate = function () {
   const callOn = this.idl.static ? "Impl" : "this[impl]";
 
   const parameterConversions = Parameters.generateOverloadConversions(overloads, this.obj.opts.customTypes);
+  const argsSpread = parameterConversions.hasArgs ? "...args" : "";
   Object.assign(requires, parameterConversions.requires);
   str += parameterConversions.body;
   if (!this.idl.stringifier && overloads.every((overload) => conversions[overload.operation.idlType.idlType])) {
     str += `
-  return ${callOn}.${name}.apply(${callOn}, args);
+  return ${callOn}.${name}(${argsSpread});
 };\n`;
   } else {
     str += `
-  return utils.tryWrapperForImpl(${callOn}.${name}.apply(${callOn}, args));
+  return utils.tryWrapperForImpl(${callOn}.${name}(${argsSpread}));
 };\n`;
   }
   if (this.idl.stringifier && name !== "toString") {
     str += `\n${this.name}.prototype.toString(${minConstructor.nameList.join(", ")}) {`;
     str += parameterConversions.body;
     str += `
-  return ${callOn}.${name}.apply(${callOn}, args);
+  return ${callOn}.${name}.apply(${argsSpread});
 };\n`;
   }
 

diff --git a/lib/parameters.js b/lib/parameters.js
@@ -114,6 +114,7 @@ module.exports.generateOverloadConversions = function (overloads, customTypes) {
   }
   return {
     requires,
-    body: str
+    body: str,
+    hasArgs: !isAlwaysZeroArgs
   };
 };