Remove module all components import

Signed-off-by: Paolo Di Tommaso <[email protected]>
nextflow-io · Jul 29, 2023 · a6d08c0 · a6d08c0
1 parent a59af39
commit a6d08c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/script/ScriptMeta.groovy b/modules/nextflow/src/main/groovy/nextflow/script/ScriptMeta.groovy
@@ -327,16 +327,12 @@ class ScriptMeta {
 
     void addModule(ScriptMeta script, String name, String alias) {
         assert script
-        if( name ) {
-            // include a specific
-            def item = script.getComponent(name)
-            if( !item )
-                throw new MissingModuleComponentException(script, name)
-            addModule0(item, alias)
-        }
-        else for( def item : script.getDefinitions() ) {
-            addModule0(item)
-        }
+        assert name
+        // include a specific
+        def item = script.getComponent(name)
+        if( !item )
+            throw new MissingModuleComponentException(script, name)
+        addModule0(item, alias)
     }
 
     protected void addModule0(ComponentDef component, String alias=null) {

diff --git a/modules/nextflow/src/test/groovy/nextflow/script/ScriptMetaTest.groovy b/modules/nextflow/src/test/groovy/nextflow/script/ScriptMetaTest.groovy
@@ -83,7 +83,9 @@ class ScriptMetaTest extends Dsl2Spec {
         meta3.addDefinition(proc3, func3, work3)
 
         when:
-        meta1.addModule(meta2, null, null)
+        meta1.addModule(meta2, 'func2', null)
+        meta1.addModule(meta2, 'proc2', null)
+        meta1.addModule(meta2, 'work2', null)
         meta1.addModule(meta3, 'proc3', 'my_process')
         meta1.addModule(meta3, 'work3', null)