fix: Use correct [ImplicitThis] behaviour

Author: ExE-Boss

lib/constructs/attribute.js

@@ -23,23 +23,15 @@ class Attribute {
 
     const onInstance = utils.isOnInstance(this.idl, this.interface.idl);
 
-    let objName = `this`;
-    if (onInstance) { // we're in a setup method
-      objName = `obj`;
-    }
-    let brandCheck = this.interface.isGlobal ? `
-      if (this !== null && this !== undefined && !exports.is(this)) {
-        throw new TypeError("Illegal invocation");
-      }
-    ` : `
-      if (!this || !exports.is(this)) {
+    let brandCheck = `
+      if (!exports.is(esValue)) {
         throw new TypeError("Illegal invocation");
       }
     `;
-    let getterBody = `return utils.tryWrapperForImpl(${objName}[impl]["${this.idl.name}"]);`;
-    let setterBody = `${objName}[impl]["${this.idl.name}"] = V;`;
+    let getterBody = `return utils.tryWrapperForImpl(esValue[impl]["${this.idl.name}"]);`;
+    let setterBody = `esValue[impl]["${this.idl.name}"] = V;`;
     if (conversions[this.idl.idlType.idlType]) {
-      getterBody = `return ${objName}[impl]["${this.idl.name}"];`;
+      getterBody = `return esValue[impl]["${this.idl.name}"];`;
     }
 
     const addMethod = this.static ?
@@ -55,8 +47,8 @@ class Attribute {
         throw new Error("Unknown reflector type: " + this.idl.idlType.idlType);
       }
       const attrName = shouldReflect.rhs && shouldReflect.rhs.value.replace(/_/g, "-") || this.idl.name;
-      getterBody = reflector[this.idl.idlType.idlType].get(objName, attrName.toLowerCase());
-      setterBody = reflector[this.idl.idlType.idlType].set(objName, attrName.toLowerCase());
+      getterBody = reflector[this.idl.idlType.idlType].get("esValue", attrName.toLowerCase());
+      setterBody = reflector[this.idl.idlType.idlType].set("esValue", attrName.toLowerCase());
     }
 
     if (utils.getExtAttr(this.idl.extAttrs, "LenientThis")) {
@@ -75,6 +67,7 @@ class Attribute {
     }
 
     addMethod(this.idl.name, [], `
+      const esValue = this !== null && this !== undefined ? this : globalObject;
       ${brandCheck}
       ${getterBody}
     `, "get", { configurable });
@@ -99,19 +92,22 @@ class Attribute {
       }
 
       addMethod(this.idl.name, ["V"], `
+        const esValue = this !== null && this !== undefined ? this : globalObject;
         ${brandCheck}
         ${idlConversion}
         ${setterBody}
       `, "set", { configurable });
     } else if (utils.getExtAttr(this.idl.extAttrs, "PutForwards")) {
       addMethod(this.idl.name, ["V"], `
+        const esValue = this !== null && this !== undefined ? this : globalObject;
         ${brandCheck}
         this.${this.idl.name}.${utils.getExtAttr(this.idl.extAttrs, "PutForwards").rhs.value} = V;
       `, "set", { configurable });
     } else if (utils.getExtAttr(this.idl.extAttrs, "Replaceable")) {
       addMethod(this.idl.name, ["V"], `
+        const esValue = this !== null && this !== undefined ? this : globalObject;
         ${brandCheck}
-        Object.defineProperty(this, "${this.idl.name}", {
+        Object.defineProperty(esValue, "${this.idl.name}", {
           configurable: true,
           enumerable: true,
           value: V,

lib/constructs/operation.js

@@ -61,22 +61,15 @@ class Operation {
     const argNames = minOp.nameList;
 
     if (!this.static) {
-      if (this.interface.isGlobal) {
-        str += `
-          if (this !== null && this !== undefined && !exports.is(this)) {
-            throw new TypeError("Illegal invocation");
-          }
-        `;
-      } else {
-        str += `
-          if (!this || !exports.is(this)) {
-            throw new TypeError("Illegal invocation");
-          }
-        `;
-      }
+      str += `
+        const esValue = this !== null && this !== undefined ? this : globalObject;
+        if (!exports.is(esValue)) {
+          throw new TypeError("Illegal invocation");
+        }
+      `;
     }
 
-    const callOn = this.static ? "Impl.implementation" : `${this.interface.isGlobal ? "obj" : "this"}[impl]`;
+    const callOn = this.static ? "Impl.implementation" : `esValue[impl]`;
     // In case of stringifiers, use the named implementation function rather than hardcoded "toString".
     // All overloads will have the same name, so pick the first one.
     const implFunc = this.idls[0].name || this.name;