Replace remaining task.ext.suffix with task.ext.prefix (#1117)

* Replace remaining task.ext.suffix with task.ext.prefix

modules/artic/minion/main.nf

@@ -33,7 +33,7 @@ process ARTIC_MINION {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     def version  = scheme_version.toString().toLowerCase().replaceAll('v','')
     def fast5    = fast5_dir ? "--fast5-directory $fast5_dir"             : ""
     def summary  = sequencing_summary ? "--sequencing-summary $sequencing_summary" : ""

modules/bakta/main.nf

@@ -27,7 +27,7 @@ process BAKTA {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     def proteins_opt = proteins ? "--proteins ${proteins[0]}" : ""
     def prodigal_opt = prodigal_tf ? "--prodigal-tf ${prodigal_tf[0]}" : ""
     """
@@ -47,7 +47,7 @@ process BAKTA {
     """
 
     stub:
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix = task.ext.prefix ?: "${meta.id}"
     """
     touch ${prefix}.embl
     touch ${prefix}.faa

modules/bcftools/concat/main.nf

@@ -16,7 +16,7 @@ process BCFTOOLS_CONCAT {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     bcftools concat \\
         --output ${prefix}.vcf.gz \\

modules/bcftools/isec/main.nf

@@ -16,7 +16,7 @@ process BCFTOOLS_ISEC {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     bcftools isec  \\
         $args \\

modules/bcftools/merge/main.nf

@@ -16,7 +16,7 @@ process BCFTOOLS_MERGE {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     bcftools merge -Oz \\
         --output ${prefix}.vcf.gz \\

modules/bedtools/getfasta/main.nf

@@ -17,7 +17,7 @@ process BEDTOOLS_GETFASTA {
 
     script:
     def args   = task.ext.args   ?: ''
-    def prefix = task.ext.suffix ? "${bed.baseName}${task.ext.suffix}" : "${bed.baseName}"
+    def prefix = task.ext.prefix ?: "${bed.baseName}"
     """
     bedtools \\
         getfasta \\

modules/checkm/lineagewf/main.nf

@@ -18,7 +18,7 @@ process CHECKM_LINEAGEWF {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     checkm \\
         lineage_wf \\

modules/csvtk/concat/main.nf

@@ -18,7 +18,7 @@ process CSVTK_CONCAT {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     def delimiter = in_format == "tsv" ? "\t" : (in_format == "csv" ? "," : in_format)
     def out_delimiter = out_format == "tsv" ? "\t" : (out_format == "csv" ? "," : out_format)
     out_extension = out_format == "tsv" ? 'tsv' : 'csv'

modules/damageprofiler/main.nf

@@ -19,7 +19,7 @@ process DAMAGEPROFILER {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     def reference    = fasta ? "-r $fasta" : ""
     def species_list = specieslist ? "-sf $specieslist" : ""
     """

modules/dedup/main.nf

@@ -19,7 +19,7 @@ process DEDUP {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
 
     """
     dedup \\

modules/fargene/main.nf

@@ -33,7 +33,7 @@ process FARGENE {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     fargene \\
         $args \\

modules/gatk4/genomicsdbimport/main.nf

@@ -21,7 +21,7 @@ process GATK4_GENOMICSDBIMPORT {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
 
     // settings for running default create gendb mode
     inputs_command = input_map ? "--sample-name-map ${vcf[0]}" : "${'-V ' + vcf.join(' -V ')}"

modules/gffread/main.nf

@@ -16,7 +16,7 @@ process GFFREAD {
 
     script:
     def args   = task.ext.args   ?: ''
-    def prefix = task.ext.suffix ? "${gff.baseName}${task.ext.suffix}" : "${gff.baseName}"
+    def prefix = task.ext.prefix ?: "${gff.baseName}"
     """
     gffread \\
         $gff \\

modules/leehom/main.nf

@@ -25,7 +25,7 @@ process LEEHOM {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
 
     if (reads.toString().endsWith('.bam')) {
         """

modules/msisensor/msi/main.nf

@@ -19,7 +19,7 @@ process MSISENSOR_MSI {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     msisensor \\
         msi \\

modules/nextclade/main.nf

@@ -20,7 +20,7 @@ process NEXTCLADE {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     nextclade \\
         $args \\

modules/optitype/main.nf

@@ -17,7 +17,7 @@ process OPTITYPE {
     script:
     def args  = task.ext.args   ?: ''
     def args2 = task.ext.args2  ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix    = task.ext.prefix ?: "${meta.id}"
 
     """
     # Create a config for OptiType on a per sample basis with task.ext.args2

modules/plasmidid/main.nf

@@ -24,7 +24,7 @@ process PLASMIDID {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     plasmidID \\
         -d $fasta \\

modules/prodigal/main.nf

@@ -20,7 +20,7 @@ process PRODIGAL {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     """
     prodigal -i "${genome}" \\
         $args \\

modules/prokka/main.nf

@@ -29,7 +29,7 @@ process PROKKA {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     def proteins_opt = proteins ? "--proteins ${proteins[0]}" : ""
     def prodigal_opt = prodigal_tf ? "--prodigaltf ${prodigal_tf[0]}" : ""
     """

modules/qualimap/bamqc/main.nf

@@ -18,7 +18,7 @@ process QUALIMAP_BAMQC {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
 
     def collect_pairs = meta.single_end ? '' : '--collect-overlap-pairs'
     def memory     = task.memory.toGiga() + "G"

modules/qualimap/rnaseq/main.nf

@@ -17,7 +17,7 @@ process QUALIMAP_RNASEQ {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     def paired_end = meta.single_end ? '' : '-pe'
     def memory     = task.memory.toGiga() + "G"
 

modules/quast/main.nf

@@ -20,7 +20,7 @@ process QUAST {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ?: 'quast'
+    prefix   = task.ext.prefix ?: 'quast'
     def features  = use_gff ? "--features $gff" : ''
     def reference = use_fasta ? "-r $fasta" : ''
     """

modules/rsem/calculateexpression/main.nf

@@ -24,7 +24,7 @@ process RSEM_CALCULATEEXPRESSION {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
 
     def strandedness = ''
     if (meta.strandedness == 'forward') {

modules/salmon/quant/main.nf

@@ -21,7 +21,7 @@ process SALMON_QUANT {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
 
     def reference   = "--index $index"
     def input_reads = meta.single_end ? "-r $reads" : "-1 ${reads[0]} -2 ${reads[1]}"

modules/samtools/merge/main.nf

@@ -18,7 +18,7 @@ process SAMTOOLS_MERGE {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     def file_type = input_files[0].getExtension()
     def reference = fasta ? "--reference ${fasta}" : ""
     """

modules/seqkit/split2/main.nf

@@ -17,7 +17,6 @@ process SEQKIT_SPLIT2 {
     script:
     def args   = task.ext.args   ?: ''
     def prefix = task.ext.prefix ?: "${meta.id}"
-
     if(meta.single_end){
         """
         seqkit \\

modules/seqtk/subseq/main.nf

@@ -17,7 +17,7 @@ process SEQTK_SUBSEQ {
 
     script:
     def args   = task.ext.args   ?: ''
-    def prefix = task.ext.suffix ?: ''
+    def prefix = task.ext.prefix ?: ''
     def ext = "fa"
     if ("$sequences" ==~ /.+\.fq|.+\.fq.gz|.+\.fastq|.+\.fastq.gz/) {
         ext = "fq"

modules/tbprofiler/profile/main.nf

@@ -20,7 +20,7 @@ process TBPROFILER_PROFILE {
 
     script:
     def args = task.ext.args   ?: ''
-    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    prefix   = task.ext.prefix ?: "${meta.id}"
     def input_reads = meta.single_end ? "--read1 $reads" : "--read1 ${reads[0]} --read2 ${reads[1]}"
     """
     tb-profiler \\

tests/modules/gffread/nextflow.config

@@ -3,7 +3,7 @@ process {
     publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" }
 
     withName: GFFREAD {
-        ext.prefix = { "${meta.id}.out" }
+        ext.prefix = { "${gff.baseName}.out" }
     }
 
 }

tests/modules/seqtk/subseq/nextflow.config

@@ -3,7 +3,7 @@ process {
     publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" }
 
     withName: SEQTK_SUBSEQ {
-        ext.prefix = { "${meta.id}.filtered" }
+        ext.prefix = { ".filtered" }
     }
 
 }