add tests, bug fixes for FunctionExpression, CallExpression.

Also adds transform function to ensure that node types match those expected by escodegen.

Author: jonschlinkert

.eslintrc.json

@@ -18,112 +18,116 @@
   },
 
   "rules": {
-    "accessor-pairs": 2,
-    "arrow-parens": [2, "as-needed"],
-    "arrow-spacing": [2, { "before": true, "after": true }],
-    "block-spacing": [2, "always"],
-    "brace-style": [2, "1tbs", { "allowSingleLine": true }],
-    "comma-dangle": [2, "never"],
-    "comma-spacing": [2, { "before": false, "after": true }],
-    "comma-style": [2, "last"],
-    "constructor-super": 2,
-    "curly": [2, "multi-line"],
-    "dot-location": [2, "property"],
-    "eol-last": 2,
-    "eqeqeq": [2, "allow-null"],
-    "generator-star-spacing": [2, { "before": true, "after": true }],
-    "handle-callback-err": [2, "^(err|error)$"],
-    "indent": [2, 2, { "SwitchCase": 1 }],
-    "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
-    "keyword-spacing": [2, { "before": true, "after": true }],
-    "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
-    "new-parens": 2,
-    "no-array-constructor": 2,
-    "no-caller": 2,
-    "no-class-assign": 2,
-    "no-cond-assign": 2,
-    "no-const-assign": 2,
-    "no-control-regex": 2,
-    "no-debugger": 2,
-    "no-delete-var": 2,
-    "no-dupe-args": 2,
-    "no-dupe-class-members": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-empty-character-class": 2,
-    "no-eval": 2,
-    "no-ex-assign": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-extra-boolean-cast": 2,
-    "no-extra-parens": [2, "functions"],
-    "no-fallthrough": 2,
-    "no-floating-decimal": 2,
-    "no-func-assign": 2,
-    "no-implied-eval": 2,
-    "no-implicit-coercion": 2,
-    "no-inner-declarations": [2, "functions"],
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-iterator": 2,
-    "no-label-var": 2,
-    "no-labels": 2,
-    "no-lone-blocks": 2,
-    "no-lonely-if": 2,
-    "no-mixed-spaces-and-tabs": 2,
+    "accessor-pairs": 1,
+    "arrow-parens": [1, "as-needed"],
+    "arrow-spacing": [1, { "before": true, "after": true }],
+    "block-spacing": [1, "always"],
+    "brace-style": [1, "1tbs", { "allowSingleLine": true }],
+    "comma-dangle": [1, "never"],
+    "comma-spacing": [1, { "before": false, "after": true }],
+    "comma-style": [1, "last"],
+    "constructor-super": 1,
+    "curly": [1, "multi-line"],
+    "dot-location": [1, "property"],
+    "eol-last": 1,
+    "eqeqeq": [1, "allow-null"],
+    "generator-star-spacing": [1, { "before": true, "after": true }],
+    "handle-callback-err": [1, "^(err|error)$"],
+    "indent": [1, 2, { "SwitchCase": 1 }],
+    "key-spacing": [1, { "beforeColon": false, "afterColon": true }],
+    "keyword-spacing": [1, { "before": true, "after": true }],
+    "new-cap": [1, { "newIsCap": true, "capIsNew": false }],
+    "new-parens": 1,
+    "no-array-constructor": 1,
+    "no-caller": 1,
+    "no-class-assign": 1,
+    "no-cond-assign": 1,
+    "no-const-assign": 1,
+    "no-control-regex": 1,
+    "no-debugger": 1,
+    "no-delete-var": 1,
+    "no-dupe-args": 1,
+    "no-dupe-class-members": 1,
+    "no-dupe-keys": 1,
+    "no-duplicate-case": 1,
+    "no-duplicate-imports": 1,
+    "no-empty": 1,
+    "no-empty-character-class": 1,
+    "no-eval": 1,
+    "no-ex-assign": 1,
+    "no-extend-native": 1,
+    "no-extra-bind": 1,
+    "no-extra-boolean-cast": 1,
+    "no-extra-parens": [1, "functions"],
+    "no-extra-semi": 1,
+    "no-fallthrough": 1,
+    "no-floating-decimal": 1,
+    "no-func-assign": 1,
+    "no-implied-eval": 1,
+    "no-invalid-this": 0,
+    "no-implicit-coercion": 1,
+    "no-inner-declarations": [1, "functions"],
+    "no-invalid-regexp": 1,
+    "no-irregular-whitespace": 1,
+    "no-iterator": 1,
+    "no-label-var": 1,
+    "no-labels": 1,
+    "no-lone-blocks": 1,
+    "no-lonely-if": 1,
+    "no-mixed-spaces-and-tabs": 1,
     "no-multi-spaces": 0,
-    "no-multi-str": 2,
-    "no-multiple-empty-lines": [2, { "max": 1 }],
-    "no-native-reassign": 2,
-    "no-negated-in-lhs": 2,
-    "no-new": 2,
-    "no-new-func": 2,
-    "no-new-object": 2,
-    "no-new-require": 2,
-    "no-new-wrappers": 2,
-    "no-obj-calls": 2,
-    "no-octal": 2,
-    "no-octal-escape": 2,
-    "no-proto": 2,
-    "no-redeclare": 2,
-    "no-regex-spaces": 2,
-    "no-return-assign": 2,
-    "no-self-compare": 2,
-    "no-sequences": 2,
-    "no-shadow-restricted-names": 2,
-    "no-spaced-func": 2,
-    "no-sparse-arrays": 2,
-    "no-this-before-super": 2,
-    "no-throw-literal": 2,
-    "no-trailing-spaces": 2,
+    "no-multi-str": 1,
+    "no-multiple-empty-lines": [1, { "max": 1 }],
+    "no-native-reassign": 1,
+    "no-negated-in-lhs": 1,
+    "no-new": 1,
+    "no-new-func": 1,
+    "no-new-object": 1,
+    "no-new-require": 1,
+    "no-new-wrappers": 1,
+    "no-obj-calls": 1,
+    "no-octal": 1,
+    "no-octal-escape": 1,
+    "no-proto": 1,
+    "no-redeclare": 1,
+    "no-regex-spaces": 1,
+    "no-return-assign": 1,
+    "no-self-compare": 1,
+    "no-sequences": 1,
+    "no-shadow-restricted-names": 1,
+    "no-spaced-func": 1,
+    "no-sparse-arrays": 1,
+    "no-this-before-super": 1,
+    "no-throw-literal": 1,
+    "no-trailing-spaces": 1,
     "no-undef": 2,
-    "no-undef-init": 2,
-    "no-unexpected-multiline": 2,
-    "no-unneeded-ternary": [2, { "defaultAssignment": false }],
-    "no-unreachable": 2,
-    "no-unused-expressions": 2,
-    "no-unused-vars": [2, { "vars": "all", "args": "none" }],
-    "no-useless-call": 2,
-    "no-with": 2,
+    "no-undef-init": 1,
+    "no-unexpected-multiline": 1,
+    "no-unneeded-ternary": [1, { "defaultAssignment": false }],
+    "no-unreachable": 1,
+    "no-unused-expressions": 1,
+    "no-unused-vars": [1, { "vars": "all", "args": "none" }],
+    "no-useless-call": 1,
+    "no-with": 1,
     "object-curly-spacing": ["error", "always", { "objectsInObjects": true }],
-    "one-var": [2, { "initialized": "never" }],
+    "one-var": [1, { "initialized": "never" }],
     "operator-linebreak": [0, "after", { "overrides": { "?": "before", ":": "before" } }],
     "padded-blocks": [0, "never"],
-    "prefer-const": [2, { "destructuring": "all", "ignoreReadBeforeAssign": false }],
-    "quotes": [2, "single", "avoid-escape"],
-    "radix": 2,
-    "semi": [2, "always"],
-    "semi-spacing": [2, { "before": false, "after": true }],
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, { "anonymous": "never", "named": "never", "asyncArrow": "always" }],
-    "space-in-parens": [2, "never"],
-    "space-infix-ops": 2,
-    "space-unary-ops": [2, { "words": true, "nonwords": false }],
+    "prefer-const": [1, { "destructuring": "all", "ignoreReadBeforeAssign": false }],
+    "quotes": [1, "single", "avoid-escape"],
+    "radix": 1,
+    "semi": [1, "always"],
+    "semi-spacing": [1, { "before": false, "after": true }],
+    "space-before-blocks": [1, "always"],
+    "space-before-function-paren": [1, { "anonymous": "never", "named": "never", "asyncArrow": "always" }],
+    "space-in-parens": [1, "never"],
+    "space-infix-ops": 1,
+    "space-unary-ops": [1, { "words": true, "nonwords": false }],
     "spaced-comment": [0, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
-    "strict": 2,
-    "use-isnan": 2,
-    "valid-typeof": 2,
-    "wrap-iife": [2, "any"],
-    "yoda": [2, "never"]
+    "strict": 1,
+    "use-isnan": 1,
+    "valid-typeof": 1,
+    "wrap-iife": [1, "any"],
+    "yoda": [1, "never"]
   }
 }

.gitignore

@@ -71,3 +71,4 @@ vendor
 .chat
 *.generated.*
 *.updated.*
+issues.md

README.md

@@ -370,7 +370,7 @@ You might also be interested in these projects:
 
 | **Commits** | **Contributor** |  
 | --- | --- |  
-| 42 | [jonschlinkert](https://github.com/jonschlinkert) |  
+| 45 | [jonschlinkert](https://github.com/jonschlinkert) |  
 | 1  | [6utt3rfly](https://github.com/6utt3rfly) |  
 | 1  | [freshgum-bubbles](https://github.com/freshgum-bubbles) |  
 
@@ -389,4 +389,4 @@ Released under the [MIT License](LICENSE).
 
 ***
 
-_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.8.0, on February 06, 2025._
+_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.8.0, on April 19, 2025._

lib/Expression.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const ExpressionSync = require('./ExpressionSync');
+const transform = require('./transform');
 const variables = require('./variables');
 const utils = require('./utils');
 
@@ -21,13 +22,18 @@ class Expression extends ExpressionSync {
   async comparison(left, operator, right, context, node) {
     const bool = this.options.booleanLogicalOperators === true;
 
-    if (typeof left === 'symbol' || typeof right === 'symbol') {
+    if (typeof left === 'symbol'  && left === Expression.FAIL) {
+      this.state.fail = true;
+      return Expression.FAIL;
+    }
+
+    if (typeof right === 'symbol' && right === Expression.FAIL) {
       this.state.fail = true;
       return Expression.FAIL;
     }
 
     const s = v => {
-      if (typeof v === 'symbol') {
+      if (typeof v === 'symbol' && v === Expression.FAIL) {
         this.state.fail = true;
         return;
       }
@@ -38,16 +44,6 @@ class Expression extends ExpressionSync {
     const val = () => s(typeof right === 'function' ? right() : right);
 
     switch (operator) {
-      case 'in': {
-        const value = await val();
-
-        if (!this.options.strict && (typeof value === 'string' || Array.isArray(value))) {
-          return value.includes(left);
-        }
-
-        return left in value;
-      }
-
       // Arithmetic operators
       case '+': return left + await val();
       case '-': return left - await val();
@@ -57,11 +53,20 @@ class Expression extends ExpressionSync {
       case '**': return left ** await val();
 
       // Relational operators
-      case 'instanceof': return left instanceof await val();
       case '<': return left < await val();
       case '>': return left > await val();
       case '<=': return left <= await val();
       case '>=': return left >= await val();
+      case 'instanceof': return left instanceof await val();
+      case 'in': {
+        const value = await val();
+
+        if (!this.options.strict && (typeof value === 'string' || Array.isArray(value))) {
+          return value.includes(left);
+        }
+
+        return left in value;
+      }
 
       // Equality operators
       case '!==': return left !== await val();
@@ -128,6 +133,13 @@ class Expression extends ExpressionSync {
     }
   }
 
+  async BinaryExpression(node, context) {
+    const left = await this.visit(node.left, context, node);
+    const right = () => this.visit(node.right, context, node);
+
+    return this.comparison(left, node.operator, right, context, node);
+  }
+
   async BlockStatement(node, context, parent) {
     const output = [];
 
@@ -202,6 +214,10 @@ class Expression extends ExpressionSync {
     output += await this.visit(node.quasis[length], context, node);
     return output;
   }
+
+  async YieldExpression(node, context) {
+    throw new SyntaxError('YieldExpression is not supported yet');
+  }
 }
 
 Expression.evaluate.sync = (...args) => ExpressionSync.evaluate(...args);

lib/ExpressionSync.js

@@ -34,6 +34,7 @@ class ExpressionSync {
       seenObjects: new WeakSet(),
       templateLiterals: new Set()
     };
+
     this.stack = [];
     this.seen = new Set();
 
@@ -46,6 +47,7 @@ class ExpressionSync {
 
   incrementDepth() {
     this.state.expressionDepth++;
+
     if (this.state.expressionDepth > MAX_EXPRESSION_DEPTH) {
       throw new RangeError('Maximum expression depth exceeded');
     }
@@ -393,7 +395,10 @@ class ExpressionSync {
       if (type === 'SpreadElement') {
         Object.assign(object, this.visit(property, context, node));
       } else {
-        const name = property.computed ? this.visit(key, context, property) : (key.value || key.name);
+        const name = property.computed
+          ? this.visit(key, context, property)
+          : (key.value || key.name);
+
         object[name] = this.visit(value, context, property);
       }
     }
@@ -469,6 +474,7 @@ class ExpressionSync {
         case '!': return !v;
         case '+': return +v; // eslint-disable-line no-implicit-coercion
         case '-': return -v;
+        default: break;
       }
     };