govuk_publishing_components 42.0.0 → 43.0.0

data/node_modules/govuk-frontend/dist/govuk/components/character-count/character-count.bundle.mjs

@@ -3,44 +3,75 @@ function closestAttributeValue($element, attributeName) {
   return $closestElementWithAttribute ? $closestElementWithAttribute.getAttribute(attributeName) : null;
 }
 
+function normaliseString(value, property) {
+  const trimmedValue = value ? value.trim() : '';
+  let output;
+  let outputType = property == null ? void 0 : property.type;
+  if (!outputType) {
+    if (['true', 'false'].includes(trimmedValue)) {
+      outputType = 'boolean';
+    }
+    if (trimmedValue.length > 0 && isFinite(Number(trimmedValue))) {
+      outputType = 'number';
+    }
+  }
+  switch (outputType) {
+    case 'boolean':
+      output = trimmedValue === 'true';
+      break;
+    case 'number':
+      output = Number(trimmedValue);
+      break;
+    default:
+      output = value;
+  }
+  return output;
+}
+
+/**
+ * @typedef {import('./index.mjs').SchemaProperty} SchemaProperty
+ */
+
 function mergeConfigs(...configObjects) {
-  function flattenObject(configObject) {
-    const flattenedObject = {};
-    function flattenLoop(obj, prefix) {
-      for (const [key, value] of Object.entries(obj)) {
-        const prefixedKey = prefix ? `${prefix}.${key}` : key;
-        if (value && typeof value === 'object') {
-          flattenLoop(value, prefixedKey);
-        } else {
-          flattenedObject[prefixedKey] = value;
-        }
-      }
-    }
-    flattenLoop(configObject);
-    return flattenedObject;
-  }
   const formattedConfigObject = {};
   for (const configObject of configObjects) {
-    const obj = flattenObject(configObject);
-    for (const [key, value] of Object.entries(obj)) {
-      formattedConfigObject[key] = value;
+    for (const key of Object.keys(configObject)) {
+      const option = formattedConfigObject[key];
+      const override = configObject[key];
+      if (isObject(option) && isObject(override)) {
+        formattedConfigObject[key] = mergeConfigs(option, override);
+      } else {
+        formattedConfigObject[key] = override;
+      }
     }
   }
   return formattedConfigObject;
 }
-function extractConfigByNamespace(configObject, namespace) {
-  const newObject = {};
-  for (const [key, value] of Object.entries(configObject)) {
+function extractConfigByNamespace(Component, dataset, namespace) {
+  const property = Component.schema.properties[namespace];
+  if ((property == null ? void 0 : property.type) !== 'object') {
+    return;
+  }
+  const newObject = {
+    [namespace]: ({})
+  };
+  for (const [key, value] of Object.entries(dataset)) {
+    let current = newObject;
     const keyParts = key.split('.');
-    if (keyParts[0] === namespace) {
-      if (keyParts.length > 1) {
-        keyParts.shift();
+    for (const [index, name] of keyParts.entries()) {
+      if (typeof current === 'object') {
+        if (index < keyParts.length - 1) {
+          if (!isObject(current[name])) {
+            current[name] = {};
+          }
+          current = current[name];
+        } else if (key !== namespace) {
+          current[name] = normaliseString(value);
+        }
       }
-      const newKey = keyParts.join('.');
-      newObject[newKey] = value;
     }
   }
-  return newObject;
+  return newObject[namespace];
 }
 function isSupported($scope = document.body) {
   if (!$scope) {
@@ -52,28 +83,44 @@ function validateConfig(schema, config) {
   const validationErrors = [];
   for (const [name, conditions] of Object.entries(schema)) {
     const errors = [];
-    for (const {
-      required,
-      errorMessage
-    } of conditions) {
-      if (!required.every(key => !!config[key])) {
-        errors.push(errorMessage);
+    if (Array.isArray(conditions)) {
+      for (const {
+        required,
+        errorMessage
+      } of conditions) {
+        if (!required.every(key => !!config[key])) {
+          errors.push(errorMessage);
+        }
+      }
+      if (name === 'anyOf' && !(conditions.length - errors.length >= 1)) {
+        validationErrors.push(...errors);
       }
-    }
-    if (name === 'anyOf' && !(conditions.length - errors.length >= 1)) {
-      validationErrors.push(...errors);
     }
   }
   return validationErrors;
 }
+function isArray(option) {
+  return Array.isArray(option);
+}
+function isObject(option) {
+  return !!option && typeof option === 'object' && !isArray(option);
+}
 
 /**
  * Schema for component config
  *
  * @typedef {object} Schema
+ * @property {{ [field: string]: SchemaProperty | undefined }} properties - Schema properties
  * @property {SchemaCondition[]} [anyOf] - List of schema conditions
  */
 
+/**
+ * Schema property for component config
+ *
+ * @typedef {object} SchemaProperty
+ * @property {'string' | 'boolean' | 'number' | 'object'} type - Property type
+ */
+
 /**
  * Schema condition for component config
  *
@@ -82,26 +129,15 @@ function validateConfig(schema, config) {
  * @property {string} errorMessage - Error message when required config fields not provided
  */
 
-function normaliseString(value) {
-  if (typeof value !== 'string') {
-    return value;
-  }
-  const trimmedValue = value.trim();
-  if (trimmedValue === 'true') {
-    return true;
-  }
-  if (trimmedValue === 'false') {
-    return false;
-  }
-  if (trimmedValue.length > 0 && isFinite(Number(trimmedValue))) {
-    return Number(trimmedValue);
-  }
-  return value;
-}
-function normaliseDataset(dataset) {
+function normaliseDataset(Component, dataset) {
   const out = {};
-  for (const [key, value] of Object.entries(dataset)) {
-    out[key] = normaliseString(value);
+  for (const [field, property] of Object.entries(Component.schema.properties)) {
+    if (field in dataset) {
+      out[field] = normaliseString(dataset[field], property);
+    }
+    if ((property == null ? void 0 : property.type) === 'object') {
+      out[field] = extractConfigByNamespace(Component, dataset, field);
+    }
   }
   return out;
 }
@@ -171,18 +207,21 @@ class I18n {
     if (!lookupKey) {
       throw new Error('i18n: lookup key missing');
     }
-    if (typeof (options == null ? void 0 : options.count) === 'number') {
-      lookupKey = `${lookupKey}.${this.getPluralSuffix(lookupKey, options.count)}`;
+    let translation = this.translations[lookupKey];
+    if (typeof (options == null ? void 0 : options.count) === 'number' && typeof translation === 'object') {
+      const translationPluralForm = translation[this.getPluralSuffix(lookupKey, options.count)];
+      if (translationPluralForm) {
+        translation = translationPluralForm;
+      }
     }
-    const translationString = this.translations[lookupKey];
-    if (typeof translationString === 'string') {
-      if (translationString.match(/%{(.\S+)}/)) {
+    if (typeof translation === 'string') {
+      if (translation.match(/%{(.\S+)}/)) {
         if (!options) {
           throw new Error('i18n: cannot replace placeholders in string if no option data provided');
         }
-        return this.replacePlaceholders(translationString, options);
+        return this.replacePlaceholders(translation, options);
       }
-      return translationString;
+      return translation;
     }
     return lookupKey;
   }
@@ -210,12 +249,15 @@ class I18n {
     if (!isFinite(count)) {
       return 'other';
     }
+    const translation = this.translations[lookupKey];
     const preferredForm = this.hasIntlPluralRulesSupport() ? new Intl.PluralRules(this.locale).select(count) : this.selectPluralFormUsingFallbackRules(count);
-    if (`${lookupKey}.${preferredForm}` in this.translations) {
-      return preferredForm;
-    } else if (`${lookupKey}.other` in this.translations) {
-      console.warn(`i18n: Missing plural form ".${preferredForm}" for "${this.locale}" locale. Falling back to ".other".`);
-      return 'other';
+    if (typeof translation === 'object') {
+      if (preferredForm in translation) {
+        return preferredForm;
+      } else if ('other' in translation) {
+        console.warn(`i18n: Missing plural form ".${preferredForm}" for "${this.locale}" locale. Falling back to ".other".`);
+        return 'other';
+      }
     }
     throw new Error(`i18n: Plural form ".other" is required for "${this.locale}" locale`);
   }
@@ -392,7 +434,7 @@ class CharacterCount extends GOVUKFrontendComponent {
         identifier: 'Form field (`.govuk-js-character-count`)'
       });
     }
-    const datasetConfig = normaliseDataset($module.dataset);
+    const datasetConfig = normaliseDataset(CharacterCount, $module.dataset);
     let configOverrides = {};
     if ('maxwords' in datasetConfig || 'maxlength' in datasetConfig) {
       configOverrides = {
@@ -405,7 +447,7 @@ class CharacterCount extends GOVUKFrontendComponent {
     if (errors[0]) {
       throw new ConfigError(`Character count: ${errors[0]}`);
     }
-    this.i18n = new I18n(extractConfigByNamespace(this.config, 'i18n'), {
+    this.i18n = new I18n(this.config.i18n, {
       locale: closestAttributeValue($module, 'lang')
     });
     this.maxLength = (_ref = (_this$config$maxwords = this.config.maxwords) != null ? _this$config$maxwords : this.config.maxlength) != null ? _ref : Infinity;
@@ -618,6 +660,20 @@ CharacterCount.defaults = Object.freeze({
   }
 });
 CharacterCount.schema = Object.freeze({
+  properties: {
+    i18n: {
+      type: 'object'
+    },
+    maxwords: {
+      type: 'number'
+    },
+    maxlength: {
+      type: 'number'
+    },
+    threshold: {
+      type: 'number'
+    }
+  },
   anyOf: [{
     required: ['maxwords'],
     errorMessage: 'Either "maxlength" or "maxwords" must be provided'