Support component config schema allOf condition

alphagov · Mar 8, 2024 · a94a414 · a94a414
1 parent 4a40d63
commit a94a414
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/govuk-frontend/src/govuk/common/index.mjs b/packages/govuk-frontend/src/govuk/common/index.mjs
@@ -234,6 +234,11 @@ export function validateConfig(schema, config) {
         }
       }
 
+      // Check all conditions pass or add errors
+      if (name === 'allOf' && errors.length) {
+        validationErrors.push(...errors)
+      }
+
       // Check one condition passes or add errors
       if (name === 'anyOf' && !(conditions.length - errors.length >= 1)) {
         validationErrors.push(...errors)
@@ -271,7 +276,8 @@ function isObject(option) {
  *
  * @typedef {object} Schema
  * @property {{ [field: string]: SchemaProperty | undefined }} properties - Schema properties
- * @property {SchemaCondition[]} [anyOf] - List of schema conditions
+ * @property {SchemaCondition[]} [allOf] - List of schema conditions, all must pass
+ * @property {SchemaCondition[]} [anyOf] - List of schema conditions, any must pass
  */
 
 /**