Merge pull request #75 from davelopez/fix_format2_any_validation

Fix Format2 validation for `Any` type
davelopez · Jun 21, 2024 · c68bf6d · c68bf6d
2 parents 4368f4d + 9fe28ac
commit c68bf6d
Show file tree

Hide file tree

Showing 3 changed files with 25 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
         )
       );

diff --git a/server/gx-workflow-ls-format2/tests/integration/validation.test.ts b/server/gx-workflow-ls-format2/tests/integration/validation.test.ts
@@ -111,6 +111,21 @@ steps:
     expect(diagnostics[0].message).toContain("Type mismatch for field 'top'. Expected 'float' but found 'string'.");
   });
 
+  it("should not report error for properties with Any type", async () => {
+    const content = `
+class: GalaxyWorkflow
+inputs:
+outputs:
+steps:
+    step:
+      tool_state:
+        value: "any value"
+        another_value: 42
+    `;
+    const diagnostics = await validateDocument(content);
+    expect(diagnostics).toHaveLength(0);
+  });
+
   describe("Custom Rules", () => {
     let rule: ValidationRule;