Fix validation of properties with Any type

davelopez · Jun 21, 2024 · 9fe28ac · 9fe28ac
1 parent 85e3cd6
commit 9fe28ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/server/gx-workflow-ls-format2/src/schema/definitions.ts b/server/gx-workflow-ls-format2/src/schema/definitions.ts
@@ -199,6 +199,10 @@ export class EnumSchemaNode implements SchemaNode {
     return this._schemaEnum.name;
   }
 
+  public matchesType(typeName: string): boolean {
+    return this.name === "Any" || this.symbols.includes(typeName);
+  }
+
   //Override toString for debugging purposes
   public toString(): string {
     return `EnumSchemaNode: ${this.name} - ${this.symbols}`;

diff --git a/server/gx-workflow-ls-format2/src/services/schemaValidationService.ts b/server/gx-workflow-ls-format2/src/services/schemaValidationService.ts
@@ -54,17 +54,20 @@ export class GxFormat2SchemaValidationService implements WorkflowValidator {
       }
     }
   }
+
   private validateEnumValue(
     node: StringASTNode,
-    schemaRecord: EnumSchemaNode,
+    enumSchemaNode: EnumSchemaNode,
     range: Range,
     diagnostics: Diagnostic[]
   ): void {
-    if (!schemaRecord.symbols.includes(node.value)) {
+    if (!enumSchemaNode.matchesType(node.value)) {
       diagnostics.push(
         Diagnostic.create(
           range,
-          `The value is not a valid '${schemaRecord.name}'. Allowed values are: ${schemaRecord.symbols.join(", ")}.`,
+          `The value is not a valid '${enumSchemaNode.name}'. Allowed values are: ${enumSchemaNode.symbols.join(
+            ", "
+          )}.`,
           DiagnosticSeverity.Error
         )
       );