fix: adds tests for window + proxy

Author: yowainwright

test.js

@@ -343,3 +343,25 @@ describe('ES12 / ES2021 Feature Tests', () => {
     });
   });
 });
+
+describe('ES6 / Proxy Feature Tests', () => {
+  it('👌  Es Check should fail when checking a file with `new Proxy(...)` as es5', (done) => {
+    exec('node index.js es5 ./tests/proxy.js --checkFeatures', (err, stdout, stderr) => {
+      console.log(stdout);
+      assert(err, 'Expected an error but command ran successfully');
+      done();
+    });
+  });
+
+  it('🎉  Es Check should pass when checking a file with `new Proxy(...)` as es6', (done) => {
+    exec('node index.js es6 ./tests/proxy.js --checkFeatures', (err, stdout, stderr) => {
+      if (err) {
+        console.error(err.stack);
+        console.error(stdout.toString());
+        console.error(stderr.toString());
+        return done(err);
+      }
+      done();
+    });
+  });
+});

tests/es5.js

@@ -4,4 +4,5 @@ function test() {
 	function bfunc() {}
 	bfunc();
 }
+window.getElementById('test');
 test();

tests/proxy.js

@@ -0,0 +1,13 @@
+'use strict';
+
+function demoProxy() {
+  const proxiedObject = new Proxy({}, {
+    get(target, prop) {
+      return `Intercepted: ${String(prop)}`;
+    },
+  });
+
+  console.log(proxiedObject.foo);
+}
+
+demoProxy();

utils.js

@@ -38,37 +38,40 @@ const checkDefault = () => {
  *   - objectMethod => object: 'Object', property: 'fromEntries', etc.
  */
 const checkCallExpression = (node, astInfo) => {
-  // Must be `CallExpression`
   if (node.type !== 'CallExpression') return false;
-
-  // We might check if node.callee is a MemberExpression, e.g. array.includes(...)
-  // or if node.callee is an Identifier, e.g. Symbol(...).
   if (node.callee.type === 'MemberExpression') {
     const { object, property } = astInfo;
-    // e.g. object: 'Object', property: 'entries'
-    // => node.callee.object.name === 'Object' && node.callee.property.name === 'entries'
-    if (object) {
-      if (
-        !node.callee.object ||
-        node.callee.object.type !== 'Identifier' ||
-        node.callee.object.name !== object
-      ) {
-        return false;
+
+    if (object || property) {
+
+      if (object) {
+        if (
+          !node.callee.object ||
+          node.callee.object.type !== 'Identifier' ||
+          node.callee.object.name !== object
+        ) {
+          return false;
+        }
       }
-    }
-    if (property) {
-      // e.g. property: 'includes'
-      if (!node.callee.property || node.callee.property.name !== property) {
-        return false;
+
+      if (property) {
+        if (
+          !node.callee.property || 
+          node.callee.property.type !== 'Identifier' ||
+          node.callee.property.name !== property
+        ) {
+          return false;
+        }
       }
+      return true;
     }
-    return true;
-  } else if (node.callee.type === 'Identifier') {
-    // e.g. Symbol("desc")
+    return false;
+  } 
+  
+  if (node.callee.type === 'Identifier') {
     const { callee } = astInfo;
-    // If astInfo.callee is "Symbol", check node.callee.name
-    if (callee && node.callee.name === callee) {
-      return true;
+    if (callee && !astInfo.object && !astInfo.property) {
+      return node.callee.name === callee;
     }
   }
 

utils.test.js

@@ -126,4 +126,40 @@ describe('Check Functions', function () {
     });
   });
 
+  describe('checkCallExpression', () => {
+    const { checkMap } = require('./utils');
+  
+    it('correctly distinguishes between global calls and member expressions', () => {
+      const symbolNode = {
+        type: 'CallExpression',
+        callee: {
+          type: 'Identifier',
+          name: 'Symbol'
+        }
+      };
+      
+      const getElementNode = {
+        type: 'CallExpression',
+        callee: {
+          type: 'MemberExpression',
+          object: {
+            type: 'Identifier',
+            name: 'window'
+          },
+          property: {
+            type: 'Identifier',
+            name: 'getElementById'
+          }
+        }
+      };
+  
+      assert.strictEqual(checkMap.CallExpression(symbolNode, { callee: 'Symbol' }), true);    
+      assert.strictEqual(checkMap.CallExpression(getElementNode, { callee: 'getElementById' }), false);
+      assert.strictEqual(checkMap.CallExpression(getElementNode, { 
+        object: 'window',
+        property: 'getElementById'
+      }), true);
+    });
+  });
+
 });