improve validation of MathAdd (#25)

* fix: update the grammar for the math add intrinsic func args * fix: support negative numbers as literal values
massfords · Dec 24, 2024 · c4c1c6c · c4c1c6c
1 parent b76605a
commit c4c1c6c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asl-path-validator",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Validates the path expressions for the Amazon States Language",
   "main": "./dist/index.js",
   "scripts": {

diff --git a/src/__tests__/validatePath.test.ts b/src/__tests__/validatePath.test.ts
@@ -132,6 +132,38 @@ describe("unit tests for the parser", () => {
       path: "States.MathAdd($.value1, $.step)",
       valid_in: PayloadTemplatesOnly,
     },
+    {
+      path: "States.MathAdd($.value1, -1)",
+      valid_in: PayloadTemplatesOnly,
+    },
+    {
+      path: "States.MathAdd($.value1, 1)",
+      valid_in: PayloadTemplatesOnly,
+    },
+    {
+      path: "States.MathAdd(1, -1)",
+      valid_in: PayloadTemplatesOnly,
+    },
+    {
+      path: "States.MathAdd(-1, -1)",
+      valid_in: PayloadTemplatesOnly,
+    },
+    {
+      path: "States.MathAdd(1, $.step)",
+      valid_in: PayloadTemplatesOnly,
+    },
+    {
+      path: "States.MathAdd(-1, $.step)",
+      valid_in: PayloadTemplatesOnly,
+    },
+    {
+      path: "States.MathAdd('-1', 'abc')",
+      valid_in: None,
+    },
+    {
+      path: "States.MathAdd(States.ArrayLength($$.Execution.Input.machines),-1)",
+      valid_in: PayloadTemplatesOnly,
+    },
     {
       path: "States.StringSplit($.inputString, $.splitter)",
       valid_in: PayloadTemplatesOnly,

diff --git a/src/aslPaths.pegjs b/src/aslPaths.pegjs
@@ -63,7 +63,10 @@ intrinsic_function
     / func:"States.StringToJson" args:single_arg {return {func, args}}
     / func:"States.JsonToString" args:single_arg {return {func, args}}
     / func:"States.MathRandom" args:function_args {return {func, args}}
-    / func:"States.MathAdd" args:function_args {return {func, args}}
+    / func:"States.MathAdd" PAREN_LEFT _ arg1:jsonpath_ _ COMMA _ arg2:jsonpath_ _ PAREN_RIGHT {return {func, arg1, arg2}}
+    / func:"States.MathAdd" PAREN_LEFT _ arg1:jsonpath_ _ COMMA _ arg2:(MINUS? NUMBER) _ PAREN_RIGHT {return {func, arg1, arg2}}
+    / func:"States.MathAdd" PAREN_LEFT _ arg1:(MINUS? NUMBER) _ COMMA _ arg2:jsonpath_ _ PAREN_RIGHT {return {func, arg1, arg2}}
+    / func:"States.MathAdd" PAREN_LEFT _ arg1:(MINUS? NUMBER) _ COMMA _ arg2:(MINUS? NUMBER) _ PAREN_RIGHT {return {func, arg1, arg2}}
     / func:"States.StringSplit" args:function_args {return {func, args}}
     / func:"States.UUID" args:no_args {return {func, args}}
 	/ func:"States.Format" args:function_args {return {func, args}}
@@ -119,7 +122,7 @@ comparison_op
 
 value
    = STRING
-   / NUMBER
+   / minus:MINUS? nbr:NUMBER { return (minus === '-' ? -1 : 1) * parseFloat(nbr)}
    / TRUE
    / FALSE
    / NULL