Merge pull request #527 from nf-core/fix-formula-pattern

Improve formula regex to match random effects and functions

Author: grst

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- [[#527](https://github.com/nf-core/differentialabundance/pull/513)] - Fix contrast schema to allow for random effects and other advanced formula features. ([@grst](https://github.com/grst), review by [@pinin4fjords](https://github.com/pinin4fjords)).
 - [[#513](https://github.com/nf-core/differentialabundance/pull/513)] - Fix contrast schema to allow for zero-intercept models. ([@grst](https://github.com/grst), review by [@pinin4fjords](https://github.com/pinin4fjords)).
 - [[#476](https://github.com/nf-core/differentialabundance/pull/476)] - Fixed null.csv and warning at top of report ([@SusiJo](https://github.com/SusiJo), reviewed by [@pinin4fjords](https://github.com/pinin4fjords), [@atrigila](https://github.com/atrigila), [@maxulysse](https://github.com/maxulysse))
 - [[#358](https://github.com/nf-core/differentialabundance/pull/358)] - Fixed nf-tests not running due to `--changed-since HEAD^`([@atrigila](https://github.com/atrigila), review by [@pinin4fjords](https://github.com/pinin4fjords))

assets/schema_contrasts.json

@@ -15,7 +15,7 @@
                     },
                     "formula": {
                         "type": "string",
-                        "pattern": "^~\\s*(?:[A-Za-z0-9_]+(?:\\s*(?:[:+*])\\s*[A-Za-z0-9_]+)*)?(?:\\s*-\\s*1)?$"
+                        "pattern": "^~\\s*(?:(?:[A-Za-z0-9_.]+(?:\\([^)]*\\))?|\\([^)]*\\))(?:\\s*[+*:|\\/-]\\s*(?:[A-Za-z0-9_.]+(?:\\([^)]*\\))?|\\([^)]*\\)))*)?(?:\\s*-\\s*1)?$"
                     },
                     "comparison": {
                         "type": "array",