Support component config schema allOf condition

alphagov · Feb 23, 2024 · 35220d1 · 35220d1
1 parent 2eeb7e7
commit 35220d1
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
@@ -247,6 +247,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)
@@ -262,7 +267,8 @@ export function validateConfig(schema, config) {
  *
  * @template {object} Config
  * @typedef {object} Schema
- * @property {SchemaCondition<Config>[]} [anyOf] - List of schema conditions
+ * @property {SchemaCondition<Config>[]} [allOf] - List of schema conditions, all must pass
+ * @property {SchemaCondition<Config>[]} [anyOf] - List of schema conditions, any must pass
  */
 
 /**