Merge pull request #424 from DinoChiesa/peggy-isnot

fix: re-order checks for Is and IsNot
apigee · Feb 27, 2024 · 2a2bd7b · 2a2bd7b
2 parents 445c21a + c166d94
commit 2a2bd7b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/build/ConditionParser.js b/build/ConditionParser.js
diff --git a/lib/peggy/Apigee-Condition.pegjs b/lib/peggy/Apigee-Condition.pegjs
@@ -110,8 +110,8 @@ op_or = "or"i / "||"
 op_accepts_literal
   = op_equalsnocase { return "EqualsCaseInsensitive"; }
   / op_startswith {return "StartsWith";}
-  / op_equals { return "Equals"; }
   / op_notequals { return "NotEquals"; }
+  / op_equals { return "Equals"; }
   / op_greatereq {return "GreaterThanOrEquals";}
   / op_greater {return "GreaterThan";}
   / op_lessereq {return "LesserThanOrEquals";}
@@ -122,8 +122,8 @@ op_accepts_literal
 
 op_accepts_variable
   = op_startswith {return "StartsWith";}
-  / op_equals { return "Equals"; }
   / op_notequals { return "NotEquals"; }
+  / op_equals { return "Equals"; }
   / op_greatereq {return "GreaterThanOrEquals";}
   / op_greater {return "GreaterThan";}
   / op_lessereq {return "LesserThanOrEquals";}

diff --git a/test/specs/ConditionParserTest.js b/test/specs/ConditionParserTest.js
@@ -204,11 +204,22 @@ describe("ConditionParser", function () {
       }
     });
 
-    const validOperators = ["equals", "notquals", "isnot", "is"];
+    const validOperators = ["equals", "notequals", "isnot", "is"];
     validOperators.forEach((goodOp) => {
-      const badOp = goodOp + "a";
+      const expr = (op) =>
+        `request.formparam.grant_type ${op} "authorization_code"`;
+      it(`accepts ${goodOp} as an operator`, function () {
+        const c1 = expr(goodOp);
+        try {
+          parser.parse(c1);
+          expect(true);
+        } catch (_e) {
+          expect.fail();
+        }
+      });
+      const badOp = `${goodOp}a`;
       it(`rejects ${badOp} as an operator`, function () {
-        const c1 = `request.formparam.grant_type ${badOp} "authorization_code"`;
+        const c1 = expr(badOp);
         try {
           parser.parse(c1);
           expect.fail();