Use ConfigOption additionalTypes in config spec validation

Author: bentsherman

build.gradle

@@ -33,7 +33,7 @@ configurations {
 }
 
 dependencies {
-  implementation 'io.nextflow:nf-lang:25.10.0'
+  implementation 'io.nextflow:nf-lang:25.12.0-edge'
   implementation 'org.apache.groovy:groovy:4.0.28'
   implementation 'org.apache.groovy:groovy-json:4.0.28'
   implementation 'org.apache.groovy:groovy-yaml:4.0.28'
@@ -45,13 +45,13 @@ dependencies {
   runtimeOnly 'org.yaml:snakeyaml:2.2'
 
   // include Nextflow runtime at build-time to extract language definitions
-  nextflowRuntime 'io.nextflow:nextflow:25.10.0'
-  nextflowRuntime 'io.nextflow:nf-amazon:3.4.1'
-  nextflowRuntime 'io.nextflow:nf-azure:1.20.2'
-  nextflowRuntime 'io.nextflow:nf-google:1.23.3'
-  nextflowRuntime 'io.nextflow:nf-k8s:1.2.2'
-  nextflowRuntime 'io.nextflow:nf-tower:1.17.1'
-  nextflowRuntime 'io.nextflow:nf-wave:1.16.1'
+  nextflowRuntime 'io.nextflow:nextflow:25.12.0-edge'
+  nextflowRuntime 'io.nextflow:nf-amazon:3.6.0'
+  nextflowRuntime 'io.nextflow:nf-azure:1.21.0'
+  nextflowRuntime 'io.nextflow:nf-google:1.25.0'
+  nextflowRuntime 'io.nextflow:nf-k8s:1.4.0'
+  nextflowRuntime 'io.nextflow:nf-tower:1.19.0'
+  nextflowRuntime 'io.nextflow:nf-wave:1.18.0'
 
   testImplementation ('org.objenesis:objenesis:3.4')
   testImplementation ('net.bytebuddy:byte-buddy:1.14.17')

src/main/java/nextflow/lsp/services/config/ConfigCompletionProvider.java

@@ -183,7 +183,7 @@ private void addConfigOptions(List<String> names, SpecNode.Scope spec) {
             return;
         scope.children().forEach((name, child) -> {
             if( child instanceof SpecNode.Option option )
-                ch.addItem(configOption(name, option.description(), option.type()));
+                ch.addItem(configOption(name, option.description(), option.types().get(0)));
             else
                 ch.addItem(configScope(name, child.description()));
         });
@@ -193,7 +193,7 @@ private static List<CompletionItem> topLevelItems(SpecNode.Scope spec) {
         var result = new ArrayList<CompletionItem>();
         spec.children().forEach((name, child) -> {
             if( child instanceof SpecNode.Option option ) {
-                result.add(configOption(name, option.description(), option.type()));
+                result.add(configOption(name, option.description(), option.types().get(0)));
             }
             else {
                 result.add(configScope(name, child.description()));

src/main/java/nextflow/lsp/services/config/ConfigHoverProvider.java

@@ -104,7 +104,7 @@ protected String getHoverContent(List<ASTNode> nodeStack, SpecNode.Scope spec) {
             if( option != null ) {
                 var description = StringGroovyMethods.stripIndent(option.description(), true).trim();
                 var builder = new StringBuilder();
-                builder.append(String.format("`%s (%s)`", fqName, Types.getName(option.type())));
+                builder.append(String.format("`%s (%s)`", fqName, Types.getName(option.types().get(0))));
                 builder.append("\n\n");
                 builder.append(description);
                 return builder.toString();

src/main/java/nextflow/lsp/services/config/ConfigSpecVisitor.java

@@ -17,8 +17,10 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Stack;
+import java.util.stream.Collectors;
 
 import nextflow.config.ast.ConfigApplyBlockNode;
 import nextflow.config.ast.ConfigAssignNode;
@@ -34,6 +36,7 @@
 import nextflow.script.types.TypesEx;
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassHelper;
+import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.expr.ConstantExpression;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.control.messages.SyntaxErrorMessage;
@@ -163,14 +166,29 @@ public void visitConfigAssign(ConfigAssignNode node) {
         // validate type
         if( !typeChecking )
             return;
-        var expectedType = option.type() != null ? ClassHelper.makeCached(option.type()) : ClassHelper.dynamicType();
+        var expectedTypes = option.types().stream()
+            .map(t -> ClassHelper.makeCached(t).getPlainNodeReference())
+            .toList();
         var actualType = node.value.getType();
-        if( !TypesEx.isAssignableFrom(expectedType, actualType) ) {
-            var message = "Config option '" + fqName + "' with type " + TypesEx.getName(expectedType) + " cannot be assigned to value with type " + TypesEx.getName(actualType);
+        if( !isAssignableFromAny(expectedTypes, actualType) ) {
+            var validTypes = expectedTypes.stream()
+                .map(cn -> TypesEx.getName(cn))
+                .collect(Collectors.joining(", "));
+            var message = "Config option '" + fqName + "' with cannot be assigned to value with type " + TypesEx.getName(actualType) + " -- valid types are: " + validTypes;
             addWarning(message, String.join(".", node.names), node.getLineNumber(), node.getColumnNumber());
         }
     }
 
+    private boolean isAssignableFromAny(List<ClassNode> targetTypes, ClassNode sourceType) {
+        if( targetTypes.isEmpty() )
+            return true;
+        for( var targetType : targetTypes ) {
+            if( TypesEx.isAssignableFrom(targetType, sourceType) )
+                return true;
+        }
+        return false;
+    }
+
     @Override
     public void visitConfigBlock(ConfigBlockNode node) {
         // exclude selector name from scope stack

src/main/java/nextflow/lsp/spec/ConfigSpecFactory.java

@@ -16,6 +16,7 @@
 package nextflow.lsp.spec;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -110,8 +111,14 @@ private static SpecNode fromNode(Map<String,?> node) {
 
     private static SpecNode.Option fromOption(Map<String,?> spec) {
         var description = (String) spec.get("description");
-        var type = fromType(spec.get("type"));
-        return new SpecNode.Option(description, type);
+        var types = new ArrayList<Class>();
+        types.add(fromType(spec.get("type")));
+        if( spec.containsKey("additionalTypes") ) {
+            var additionalTypes = (List) spec.get("additionalTypes");
+            for( var additionalType : additionalTypes )
+                types.add(fromType(additionalType));
+        }
+        return new SpecNode.Option(description, types);
     }
 
     private static SpecNode.Placeholder fromPlaceholder(Map<String,?> spec) {
@@ -137,6 +144,7 @@ private static SpecNode.Scope fromScope(Map<String,?> spec) {
         Map.entry("Integer", Integer.class),
         Map.entry("int", Integer.class),
         Map.entry("List", List.class),
+        Map.entry("Map", Map.class),
         Map.entry("MemoryUnit", MemoryUnit.class),
         Map.entry("Set", Set.class),
         Map.entry("String", String.class)