From c33ac559840342197a8959e75fb1d165e42679aa Mon Sep 17 00:00:00 2001
From: markford <mark@massfords.com>
Date: Thu, 24 Aug 2023 18:50:12 -0400
Subject: [PATCH] fix: set choice state variable and path fields set to
 reference paths

---
 .../invalid-choice-state-variable.json        | 27 +++++++++++++++
 src/schemas/choice.json                       | 34 +++++++++----------
 2 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 src/__tests__/definitions/invalid-choice-state-variable.json

diff --git a/src/__tests__/definitions/invalid-choice-state-variable.json b/src/__tests__/definitions/invalid-choice-state-variable.json
new file mode 100644
index 0000000..95a3cae
--- /dev/null
+++ b/src/__tests__/definitions/invalid-choice-state-variable.json
@@ -0,0 +1,27 @@
+{
+  "Comment": "Violates the rule: The values of Variable and Path fields in a comparison must be valid Reference Paths.",
+  "StartAt": "ChoiceState",
+  "States": {
+    "ChoiceState": {
+      "Type": "Choice",
+      "Choices": [
+        {
+          "Variable": "States.ArrayContains($.clients.unique, 'null')",
+          "NumericEquals": 1,
+          "Next": "FirstMatchState"
+        }
+      ],
+      "Default": "DefaultState"
+    },
+
+    "FirstMatchState": {
+      "Type": "Pass",
+      "End": true
+    },
+
+    "DefaultState": {
+      "Type": "Pass",
+      "End": true
+    }
+  }
+}
diff --git a/src/schemas/choice.json b/src/schemas/choice.json
index 8983953..b8b8f3a 100644
--- a/src/schemas/choice.json
+++ b/src/schemas/choice.json
@@ -6,7 +6,7 @@
       "type": "object",
       "properties": {
         "Variable": {
-          "type": "string"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "And": {
           "type": "array",
@@ -33,7 +33,7 @@
           "type": "boolean"
         },
         "BooleanEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "IsBoolean": {
           "type": "boolean"
@@ -42,31 +42,31 @@
           "type": "number"
         },
         "NumericEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "NumericGreaterThan": {
           "type": "number"
         },
         "NumericGreaterThanPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "NumericGreaterThanEquals": {
           "type": "number"
         },
         "NumericGreaterThanEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "NumericLessThan": {
           "type": "number"
         },
         "NumericLessThanPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "NumericLessThanEquals": {
           "type": "number"
         },
         "NumericLessThanEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "IsNumeric": {
           "type": "boolean"
@@ -75,31 +75,31 @@
           "type": "string"
         },
         "StringEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "StringGreaterThan": {
           "type": "string"
         },
         "StringGreaterThanPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "StringGreaterThanEquals": {
           "type": "string"
         },
         "StringGreaterThanEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "StringLessThan": {
           "type": "string"
         },
         "StringLessThanPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "StringLessThanEquals": {
           "type": "string"
         },
         "StringLessThanEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "StringMatches": {
           "type": "string"
@@ -111,31 +111,31 @@
           "type": "string"
         },
         "TimestampEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "TimestampGreaterThan": {
           "type": "string"
         },
         "TimestampGreaterThanPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "TimestampGreaterThanEquals": {
           "type": "string"
         },
         "TimestampGreaterThanEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "TimestampLessThan": {
           "type": "string"
         },
         "TimestampLessThanPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "TimestampLessThanEquals": {
           "type": "string"
         },
         "TimestampLessThanEqualsPath": {
-          "$ref": "paths.json#/definitions/asl_path"
+          "$ref": "paths.json#/definitions/asl_ref_path"
         },
         "IsTimestamp": {
           "type": "boolean"