Skip to content

Commit 35466d8

Browse files
committed
Improve formula regex to match random effects and functions
1 parent 8dc9306 commit 35466d8

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

assets/schema_contrasts.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"formula": {
1717
"type": "string",
18-
"pattern": "^~\\s*(?:[A-Za-z0-9_]+(?:\\s*(?:[:+*])\\s*[A-Za-z0-9_]+)*)?(?:\\s*-\\s*1)?$"
18+
"pattern": "^~\\s*(?:(?:[A-Za-z0-9_.]+(?:\\([^)]*\\))?|\\([^)]*\\))(?:\\s*[+*:|\\/-]\\s*(?:[A-Za-z0-9_.]+(?:\\([^)]*\\))?|\\([^)]*\\)))*)?(?:\\s*-\\s*1)?$"
1919
},
2020
"comparison": {
2121
"type": "array",
@@ -36,12 +36,16 @@
3636
"type": "string"
3737
}
3838
},
39-
"required": ["id"],
39+
"required": [
40+
"id"
41+
],
4042
"additionalProperties": false
4143
},
4244
"minItems": 1
4345
}
4446
},
45-
"required": ["contrasts"],
47+
"required": [
48+
"contrasts"
49+
],
4650
"additionalProperties": false
47-
}
51+
}

0 commit comments

Comments
 (0)