--- a/macros.xml	Mon Nov 21 11:40:05 2022 +0000
+++ b/macros.xml	Fri Dec 02 10:52:48 2022 +0000
@@ -1,5 +1,5 @@
 <macros>
-    <token name="@TOOL_VERSION@">14.3</token>
+    <token name="@TOOL_VERSION@">14.4</token>
     <token name="@VERSION_SUFFIX@">0</token>
     <token name="@PROFILE@">21.01</token>
     <token name="@LICENSE@">MIT</token>
@@ -39,8 +39,10 @@
                 <option value="file">Read a list of @WHAT_EXTENDED@s from a dataset</option>
             </param>
             <when value="text">
-                <param name="accession" type="text" label="Enter space separated list of @WHAT@s" help="@HELP@">
-                    <yield/>
+                <!-- command section also allows spaces as separator for backward compatibility
+                     prefer comma because this is used also in other text params-->
+                <param name="accession" type="text" label="Enter comma separated list of @WHAT@s" help="@HELP@">
+                    <validator type="length" min="1" message="Provide at least one @WHAT@"/>
                 </param>
             </when>
             <when value="file">
@@ -59,18 +61,45 @@
             </sanitizer>
         </param>
     </xml>
-    <xml name="include">
-        <param argument="--include" type="select" multiple="true" optional="true">
-            <option value="genome" selected="true">genomic sequence (genome)</option>
-            <option value="rna">transcript (rna)</option>
-            <option value="protein">amnio acid sequences (protein)</option>
-            <option value="cds">nucleotide coding sequences (cds)</option>
-            <option value="gff3">general feature file (gff3)</option>
-            <option value="gtf">gene transfer format (gtf)</option>
-            <option value="gbff">GenBank flat file (gbff)</option>
-            <option value="seq-report">sequence report file (seq-report)</option>
+
+    <xml name="taxon_positional">
+        <param name="taxon_positional" type="text" label="Enter taxon" help="e.g. human, mouse, bos taurus, etc."/>
+    </xml>
+
+    <xml name="ortholog">
+        <param argument="--ortholog" type="text" label="Retrieve orthologs for taxa" help="Retrieve data for an ortholog set. Provide one or more comma separated taxa (any rank) to filter results or 'all' for the complete set.">
+            <sanitizer invalid_char="">
+                <valid initial="string.letters,string.digits">
+                    <add value=" " />
+                    <add value="," />
+                    <add value="-" />
+                </valid>
+            </sanitizer>
         </param>
     </xml>
+
+    <xml name="include">
+        <param argument="--include" type="select" multiple="true" optional="true" label="Include" help="Download the following datasets (if available)">
+            <yield/>
+        </param>
+    </xml>
+    <xml name="genome_includes">
+        <option value="genome" selected="true">genomic sequence (genome)</option>
+        <option value="rna">transcript (rna)</option>
+        <option value="protein">amnio acid sequences (protein)</option>
+        <option value="cds">nucleotide coding sequences (cds)</option>
+        <option value="gff3">general feature file (gff3)</option>
+        <option value="gtf">gene transfer format (gtf)</option>
+        <option value="gbff">GenBank flat file (gbff)</option>
+        <option value="seq-report">sequence report file (seq-report)</option>
+        <yield/>
+    </xml>
+    <xml name="gene_includes">
+        <option value="gene">gene sequence (gene)</option>
+        <option value="protein" selected="true">amnio acid sequences (protein)</option>
+        <yield/>
+    </xml>
+
     <token name="@INCLUDE@"><![CDATA[
         --include
         #if $file_choices.include
@@ -79,6 +108,187 @@
             none
         #end if
     ]]></token>
+    <xml name="tsv_report_columns">
+        <param name="report_columns" type="select" multiple="true" optional="false" label="Columns in the report">
+            <option value="accession">Assembly Accession</option>
+            <option value="annotinfo-busco-complete">Annotation BUSCO Complete</option>
+            <option value="annotinfo-busco-duplicated">Annotation BUSCO Duplicated</option>
+            <option value="annotinfo-busco-fragmented">Annotation BUSCO Fragmented</option>
+            <option value="annotinfo-busco-lineage">Annotation BUSCO Lineage</option>
+            <option value="annotinfo-busco-missing">Annotation BUSCO Missing</option>
+            <option value="annotinfo-busco-singlecopy">Annotation BUSCO Single Copy</option>
+            <option value="annotinfo-busco-totalcount">Annotation BUSCO Total Count</option>
+            <option value="annotinfo-busco-ver">Annotation BUSCO Version</option>
+            <option value="annotinfo-featcount-gene-non-coding">Annotation Count Gene Non-coding</option>
+            <option value="annotinfo-featcount-gene-other">Annotation Count Gene Other</option>
+            <option value="annotinfo-featcount-gene-protein-coding">Annotation Count Gene Protein-coding</option>
+            <option value="annotinfo-featcount-gene-pseudogene">Annotation Count Gene Pseudogene</option>
+            <option value="annotinfo-featcount-gene-total">Annotation Count Gene Total</option>
+            <option value="annotinfo-method">Annotation Method</option>
+            <option value="annotinfo-name">Annotation Name</option>
+            <option value="annotinfo-pipeline">Annotation Pipeline</option>
+            <option value="annotinfo-provider">Annotation Provider</option>
+            <option value="annotinfo-release-date">Annotation Release Date</option>
+            <option value="annotinfo-release-version">Annotation Release Version</option>
+            <option value="annotinfo-report-url">Annotation Report URL</option>
+            <option value="annotinfo-software-version">Annotation Software Version</option>
+            <option value="annotinfo-status">Annotation Status</option>
+            <option value="assminfo-atypicalis-atypical">Assembly Atypical Is Atypical</option>
+            <option value="assminfo-atypicalwarnings">Assembly Atypical Warnings</option>
+            <option value="assminfo-bioproject-lineage-accession">Assembly BioProject Lineage Accession</option>
+            <option value="assminfo-bioproject-lineage-parent-accession">Assembly BioProject Lineage Parent Accession</option>
+            <option value="assminfo-bioproject-lineage-parent-accessions">Assembly BioProject Lineage Parent Accessions</option>
+            <option value="assminfo-bioproject-lineage-title">Assembly BioProject Lineage Title</option>
+            <option value="assminfo-biosample-accession">Assembly BioSample Accession</option>
+            <option value="assminfo-biosample-attribute-name">Assembly BioSample Attribute Name</option>
+            <option value="assminfo-biosample-attribute-value">Assembly BioSample Attribute Value</option>
+            <option value="assminfo-biosample-bioproject-accession">Assembly BioSample BioProject Accession</option>
+            <option value="assminfo-biosample-bioproject-parent-accession">Assembly BioSample BioProject Parent Accession</option>
+            <option value="assminfo-biosample-bioproject-parent-accessions">Assembly BioSample BioProject Parent Accessions</option>
+            <option value="assminfo-biosample-bioproject-title">Assembly BioSample BioProject Title</option>
+            <option value="assminfo-biosample-description-comment">Assembly BioSample Description Comment</option>
+            <option value="assminfo-biosample-description-organism-common-name">Assembly BioSample Description Organism Common Name</option>
+            <option value="assminfo-biosample-description-organism-infraspecific-breed">Assembly BioSample Description Organism Infraspecific Names Breed</option>
+            <option value="assminfo-biosample-description-organism-infraspecific-cultivar">Assembly BioSample Description Organism Infraspecific Names Cultivar</option>
+            <option value="assminfo-biosample-description-organism-infraspecific-ecotype">Assembly BioSample Description Organism Infraspecific Names Ecotype</option>
+            <option value="assminfo-biosample-description-organism-infraspecific-isolate">Assembly BioSample Description Organism Infraspecific Names Isolate</option>
+            <option value="assminfo-biosample-description-organism-infraspecific-sex">Assembly BioSample Description Organism Infraspecific Names Sex</option>
+            <option value="assminfo-biosample-description-organism-infraspecific-strain">Assembly BioSample Description Organism Infraspecific Names Strain</option>
+            <option value="assminfo-biosample-description-organism-name">Assembly BioSample Description Organism Name</option>
+            <option value="assminfo-biosample-description-organism-pangolin">Assembly BioSample Description Organism Pangolin Classification</option>
+            <option value="assminfo-biosample-description-organism-tax-id">Assembly BioSample Description Organism Taxonomic ID</option>
+            <option value="assminfo-biosample-description-title">Assembly BioSample Description Title</option>
+            <option value="assminfo-biosample-ids-db">Assembly BioSample Sample Identifiers Database</option>
+            <option value="assminfo-biosample-ids-label">Assembly BioSample Sample Identifiers Label</option>
+            <option value="assminfo-biosample-ids-value">Assembly BioSample Sample Identifiers Value</option>
+            <option value="assminfo-biosample-last-updated">Assembly BioSample Last updated</option>
+            <option value="assminfo-biosample-models">Assembly BioSample Models</option>
+            <option value="assminfo-biosample-owner-contact-lab">Assembly BioSample Owner Contact Lab</option>
+            <option value="assminfo-biosample-owner-name">Assembly BioSample Owner Name</option>
+            <option value="assminfo-biosample-package">Assembly BioSample Package</option>
+            <option value="assminfo-biosample-publication-date">Assembly BioSample Publication date</option>
+            <option value="assminfo-biosample-status-status">Assembly BioSample Status Status</option>
+            <option value="assminfo-biosample-status-when">Assembly BioSample Status When</option>
+            <option value="assminfo-biosample-submission-date">Assembly BioSample Submission date</option>
+            <option value="assminfo-blast-url">Assembly Blast URL</option>
+            <option value="assminfo-description">Assembly Description</option>
+            <option value="assminfo-level">Assembly Level</option>
+            <option value="assminfo-linked-assmaccession">Assembly Linked Assembly Accession</option>
+            <option value="assminfo-linked-assmtype">Assembly Linked Assembly Type</option>
+            <option value="assminfo-name">Assembly Name</option>
+            <option value="assminfo-paired-assmaccession">Assembly Paired Assembly Accession</option>
+            <option value="assminfo-paired-assmname">Assembly Paired Assembly Name</option>
+            <option value="assminfo-paired-assmstatus">Assembly Paired Assembly Status</option>
+            <option value="assminfo-refseq-category">Assembly Refseq Category</option>
+            <option value="assminfo-sequencing-tech">Assembly Sequencing Tech</option>
+            <option value="assminfo-status">Assembly Status</option>
+            <option value="assminfo-submission-date">Assembly Submission Date</option>
+            <option value="assminfo-submitter">Assembly Submitter</option>
+            <option value="assminfo-synonym">Assembly Synonym</option>
+            <option value="assminfo-type">Assembly Type</option>
+            <option value="assmstats-contig-l50">Assembly Stats Contig L50</option>
+            <option value="assmstats-contig-n50">Assembly Stats Contig N50</option>
+            <option value="assmstats-gaps-between-scaffolds-count">Assembly Stats Gaps Between Scaffolds Count</option>
+            <option value="assmstats-gc-count">Assembly Stats GC Count</option>
+            <option value="assmstats-gc-percent">Assembly Stats GC Percent</option>
+            <option value="assmstats-number-of-component-sequences">Assembly Stats Number of Component Sequences</option>
+            <option value="assmstats-number-of-contigs">Assembly Stats Number of Contigs</option>
+            <option value="assmstats-number-of-scaffolds">Assembly Stats Number of Scaffolds</option>
+            <option value="assmstats-scaffold-l50">Assembly Stats Scaffold L50</option>
+            <option value="assmstats-scaffold-n50">Assembly Stats Scaffold N50</option>
+            <option value="assmstats-total-number-of-chromosomes">Assembly Stats Total Number of Chromosomes</option>
+            <option value="assmstats-total-sequence-len">Assembly Stats Total Sequence Length</option>
+            <option value="assmstats-total-ungapped-len">Assembly Stats Total Ungapped Length</option>
+            <option value="current-accession">Current Accession</option>
+            <option value="organelle-assembly-name">Organelle Assembly Name</option>
+            <option value="organelle-bioproject-accessions">Organelle BioProject Accessions</option>
+            <option value="organelle-description">Organelle Description</option>
+            <option value="organelle-infraspecific-name">Organelle Infraspecific Name</option>
+            <option value="organelle-submitter">Organelle Submitter</option>
+            <option value="organelle-total-seq-length">Organelle Total Seq Length</option>
+            <option value="organism-common-name">Organism Common Name</option>
+            <option value="organism-infraspecific-breed">Organism Infraspecific Names Breed</option>
+            <option value="organism-infraspecific-cultivar">Organism Infraspecific Names Cultivar</option>
+            <option value="organism-infraspecific-ecotype">Organism Infraspecific Names Ecotype</option>
+            <option value="organism-infraspecific-isolate">Organism Infraspecific Names Isolate</option>
+            <option value="organism-infraspecific-sex">Organism Infraspecific Names Sex</option>
+            <option value="organism-infraspecific-strain">Organism Infraspecific Names Strain</option>
+            <option value="organism-name">Organism Name</option>
+            <option value="organism-pangolin">Organism Pangolin Classification</option>
+            <option value="organism-tax-id">Organism Taxonomic ID</option>
+            <option value="source_database">Source Database</option>
+            <option value="wgs-contigs-url">WGS contigs URL</option>
+            <option value="wgs-project-accession">WGS project accession</option>
+            <option value="wgs-url">WGS URL</option>
+            <yield/>
+        </param>
+    </xml>
+
+    <xml name="gene_tsv_report_columns">
+        <param name="report_columns" type="select" multiple="true" optional="false" label="Columns in the report">
+            <option value="annotation-assembly-accession">Annotation Assembly Accession</option>
+            <option value="annotation-assembly-name">Annotation Assembly Name</option>
+            <option value="annotation-genomic-range-accession">Annotation Genomic Range Accession</option>
+            <option value="annotation-genomic-range-exon-order">Annotation Genomic Range Exons Order</option>
+            <option value="annotation-genomic-range-exon-orientation">Annotation Genomic Range Exons Orientation</option>
+            <option value="annotation-genomic-range-exon-start">Annotation Genomic Range Exons Start</option>
+            <option value="annotation-genomic-range-exon-stop">Annotation Genomic Range Exons Stop</option>
+            <option value="annotation-genomic-range-range-order">Annotation Genomic Range Order</option>
+            <option value="annotation-genomic-range-range-orientation">Annotation Genomic Range Orientation</option>
+            <option value="annotation-genomic-range-range-start">Annotation Genomic Range Start</option>
+            <option value="annotation-genomic-range-range-stop">Annotation Genomic Range Stop</option>
+            <option value="annotation-genomic-range-seq-name">Annotation Genomic Range Seq Name</option>
+            <option value="annotation-release-date">Annotation Release Date</option>
+            <option value="annotation-release-name">Annotation Release Name</option>
+            <option value="chromosomes">Chromosomes</option>
+            <option value="common-name">Common Name</option>
+            <option value="description">Description</option>
+            <option value="ensembl-geneids">Ensembl GeneIDs</option>
+            <option value="gene-id">NCBI GeneID</option>
+            <option value="gene-type">Gene Type</option>
+            <option value="genomic-region-gene-range-accession">Genomic Region Gene Range Sequence Accession</option>
+            <option value="genomic-region-gene-range-range-order">Genomic Region Gene Range Order</option>
+            <option value="genomic-region-gene-range-range-orientation">Genomic Region Gene Range Orientation</option>
+            <option value="genomic-region-gene-range-range-start">Genomic Region Gene Range Start</option>
+            <option value="genomic-region-gene-range-range-stop">Genomic Region Gene Range Stop</option>
+            <option value="genomic-region-genomic-region-type">Genomic Region Genomic Region Type</option>
+            <option value="group-id">Gene Group Identifier</option>
+            <option value="group-method">Gene Group Method</option>
+            <option value="name-authority">Nomenclature Authority</option>
+            <option value="name-id">Nomenclature ID</option>
+            <option value="omim-ids">OMIM IDs</option>
+            <option value="orientation">Orientation</option>
+            <option value="ref-standard-gene-range-accession">Reference Standard Gene Range Sequence Accession</option>
+            <option value="ref-standard-gene-range-range-order">Reference Standard Gene Range Order</option>
+            <option value="ref-standard-gene-range-range-orientation">Reference Standard Gene Range Orientation</option>
+            <option value="ref-standard-gene-range-range-start">Reference Standard Gene Range Start</option>
+            <option value="ref-standard-gene-range-range-stop">Reference Standard Gene Range Stop</option>
+            <option value="ref-standard-genomic-region-type">Reference Standard Genomic Region Type</option>
+            <option value="replaced-gene-id">Replaced NCBI GeneID</option>
+            <option value="rna-type">RNA Type</option>
+            <option value="swissprot-accessions">SwissProt Accessions</option>
+            <option value="symbol">Symbol</option>
+            <option value="synonyms">Synonyms</option>
+            <option value="tax-id">Taxonomic ID</option>
+            <option value="tax-name">Taxonomic Name</option>
+            <yield/>
+        </param>
+    </xml>
+    <xml name="prok_gene_tsv_report_columns">
+        <param name="report_columns" type="select" multiple="true" optional="false" label="Columns in the report">
+            <option value="accession">Accession</option>
+            <option value="description">Description</option>
+            <option value="ec-number">EC Number</option>
+            <option value="gene-symbol">Gene Symbol</option>
+            <option value="mapping-count">Number of Genome Mappings</option>
+            <option value="name-evidence-accession">Protein Name EvidenceAccession</option>
+            <option value="name-evidence-category">Protein Name EvidenceCategory</option>
+            <option value="name-evidence-source">Protein Name EvidenceSource</option>
+            <option value="protein-length">Protein Length</option>
+            <option value="protein-name">Protein Name</option>
+            <yield/>
+        </param>
+    </xml>
     <xml name="released_options" token_released_what="genomes" token_before_or_after="before">
         <param argument="--released-@BEFORE_OR_AFTER@" type="text" optional="true" label="Only include @RELEASED_WHAT@ that have been released @BEFORE_OR_AFTER@ a specified date (MM/DD/YYYY)">
             <validator type="regex" message="enter a date in the form MM/DD/YYYY">[0-9]{2}/[0-9]{2}/[0-9]{4}</validator>
@@ -93,9 +303,9 @@
 #end if
     </token>
 
-    <xml name="genome_fasta_assert" tokens="el1,el2,expression" token_expression_n="1">
+    <xml name="genome_fasta_assert" tokens="el1,el2,expression" token_ftype="fasta" token_expression_n="1">
         <element name="@EL1@">
-            <element name="@EL2@">
+            <element name="@EL2@" ftype="@FTYPE@" decompress="true">
                 <assert_contents>
                     <has_text_matching expression="@EXPRESSION@" n="@EXPRESSION_N@"/>
                 </assert_contents>