Merge pull request #112 from JeffDownie/main

fix: choice statements must have a Next in first level operators
ChristopheBougere · Sep 2, 2022 · 7eade83 · 7eade83
2 parents e5eee30 + 9e4874a
commit 7eade83
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/src/__tests__/definitions/invalid-choice-state.json b/src/__tests__/definitions/invalid-choice-state.json
@@ -0,0 +1,20 @@
+{
+  "Comment": "An example showing that choice states are not allowed to go directly to the end of state machine",
+  "StartAt": "ChoiceState",
+  "States": {
+    "ChoiceState": {
+      "Type": "Choice",
+      "Choices": [{
+          "Variable": "$.foo",
+          "NumericEquals": 1,
+          "End": true
+        }
+      ],
+      "Default": "DefaultState"
+    },
+    "DefaultState": {
+      "Type": "Pass",
+      "End": true
+    }
+  }
+}
diff --git a/src/__tests__/definitions/valid-choice-state.json b/src/__tests__/definitions/valid-choice-state.json
@@ -15,8 +15,13 @@
           "Next": "FirstMatchState"
         },
         {
-          "Variable": "$.foo",
-          "NumericEquals": 2,
+          "Or": [{
+            "Variable": "$.foo",
+            "NumericEquals": 2
+          }, {
+            "Variable": "$.foo",
+            "NumericEquals": 3
+          }],
           "Next": "SecondMatchState"
         }
       ],

diff --git a/src/schemas/choice.json b/src/schemas/choice.json
@@ -8,9 +8,6 @@
         "Variable": {
           "type": "string"
         },
-        "Next": {
-          "type": "string"
-        },
         "And": {
           "type": "array",
           "items": {
@@ -297,7 +294,17 @@
     "Choices": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/Operator"
+        "allOf": [{
+          "type": "object",
+          "properties": {
+            "Next": {
+              "type": "string"
+            }
+          },
+          "required": ["Next"]
+        }, {
+          "$ref": "#/definitions/Operator"
+        }]
       }
     },
     "Default": {