@defra/forms-engine-plugin 4.0.11 → 4.0.12

package/.server/server/plugins/engine/components/NumberField.js.map

@@ -1 +1 @@
-{"version":3,"file":"NumberField.js","names":["joi","FormComponent","isFormValue","messageTemplate","NumberField","constructor","def","props","options","schema","formSchema","number","custom","getValidatorPrecision","label","required","allow","messages","customValidationMessages","empty","min","max","precision","integer","customValidationMessage","message","default","stateSchema","getFormValueFromState","state","name","getFormValue","value","isValue","undefined","getViewModel","payload","errors","viewModel","attributes","prefix","suffix","inputmode","text","isNumber","getAllPossibleErrors","baseErrors","type","template","numberInteger","advancedSettingsErrors","numberMin","numberMax","numberPrecision","validateStringLength","minLength","maxLength","isValid","valueStr","String","length","error","validateMinimumPrecision","minPrecision","Number","isInteger","decimalIndex","indexOf","decimalPlaces","handleLengthValidationError","lengthCheck","helpers","errorType","contextData","context","component","validator","limit","validationSchema","prefs","convert","attempt"],"sources":["../../../../../src/server/plugins/engine/components/NumberField.ts"],"sourcesContent":["import { type NumberFieldComponent } from '@defra/forms-model'\nimport joi, {\n  type CustomHelpers,\n  type CustomValidator,\n  type NumberSchema\n} from 'joi'\n\nimport {\n  FormComponent,\n  isFormValue\n} from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormPayload,\n  type FormState,\n  type FormStateValue,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\n\nexport class NumberField extends FormComponent {\n  declare options: NumberFieldComponent['options']\n  declare schema: NumberFieldComponent['schema']\n  declare formSchema: NumberSchema\n  declare stateSchema: NumberSchema\n\n  constructor(\n    def: NumberFieldComponent,\n    props: ConstructorParameters<typeof FormComponent>[1]\n  ) {\n    super(def, props)\n\n    const { options, schema } = def\n\n    let formSchema = joi\n      .number()\n      .custom(getValidatorPrecision(this))\n      .label(this.label)\n      .required()\n\n    if (options.required === false) {\n      formSchema = formSchema.allow('')\n    } else {\n      const messages = options.customValidationMessages\n\n      formSchema = formSchema.empty('').messages({\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n        'any.required':\n          messages?.['any.required'] ?? (messageTemplate.required as string)\n      })\n    }\n\n    if (typeof schema.min === 'number') {\n      formSchema = formSchema.min(schema.min)\n    }\n\n    if (typeof schema.max === 'number') {\n      formSchema = formSchema.max(schema.max)\n    }\n\n    if (typeof schema.precision === 'number' && schema.precision <= 0) {\n      formSchema = formSchema.integer()\n    }\n\n    if (options.customValidationMessage) {\n      const message = options.customValidationMessage\n\n      formSchema = formSchema.messages({\n        'any.required': message,\n        'number.base': message,\n        'number.precision': message,\n        'number.integer': message,\n        'number.min': message,\n        'number.max': message\n      })\n    } else if (options.customValidationMessages) {\n      formSchema = formSchema.messages(options.customValidationMessages)\n    }\n\n    this.formSchema = formSchema.default('')\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = options\n    this.schema = schema\n  }\n\n  getFormValueFromState(state: FormSubmissionState) {\n    const { name } = this\n    return this.getFormValue(state[name])\n  }\n\n  getFormValue(value?: FormStateValue | FormState) {\n    return this.isValue(value) ? value : undefined\n  }\n\n  getViewModel(payload: FormPayload, errors?: FormSubmissionError[]) {\n    const { options, schema } = this\n\n    const viewModel = super.getViewModel(payload, errors)\n    let { attributes, prefix, suffix, value } = viewModel\n\n    if (typeof schema.precision === 'undefined' || schema.precision <= 0) {\n      // If precision isn't provided or provided and\n      // less than or equal to 0, use numeric inputmode\n      attributes.inputmode = 'numeric'\n    }\n\n    if (options.prefix) {\n      prefix = {\n        text: options.prefix\n      }\n    }\n\n    if (options.suffix) {\n      suffix = {\n        text: options.suffix\n      }\n    }\n\n    // Allow any `toString()`-able value so non-numeric\n    // values are shown alongside their error messages\n    if (!isFormValue(value)) {\n      value = undefined\n    }\n\n    return {\n      ...viewModel,\n      attributes,\n      prefix,\n      suffix,\n      value\n    }\n  }\n\n  isValue(value?: FormStateValue | FormState) {\n    return NumberField.isNumber(value)\n  }\n\n  /**\n   * For error preview page that shows all possible errors on a component\n   */\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    return NumberField.getAllPossibleErrors()\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors(): ErrorMessageTemplateList {\n    return {\n      baseErrors: [\n        { type: 'required', template: messageTemplate.required },\n        { type: 'numberInteger', template: messageTemplate.numberInteger }\n      ],\n      advancedSettingsErrors: [\n        { type: 'numberMin', template: messageTemplate.numberMin },\n        { type: 'numberMax', template: messageTemplate.numberMax },\n        { type: 'numberPrecision', template: messageTemplate.numberPrecision }\n      ]\n    }\n  }\n\n  static isNumber(value?: FormStateValue | FormState): value is number {\n    return typeof value === 'number'\n  }\n}\n\n/**\n * Validates string length of a numeric value\n * @param value - The numeric value to validate\n * @param minLength - Minimum required string length\n * @param maxLength - Maximum allowed string length\n * @returns Object with validation result\n */\nexport function validateStringLength(\n  value: number,\n  minLength?: number,\n  maxLength?: number\n): { isValid: boolean; error?: 'minLength' | 'maxLength' } {\n  if (typeof minLength !== 'number' && typeof maxLength !== 'number') {\n    return { isValid: true }\n  }\n\n  const valueStr = String(value)\n\n  if (typeof minLength === 'number' && valueStr.length < minLength) {\n    return { isValid: false, error: 'minLength' }\n  }\n\n  if (typeof maxLength === 'number' && valueStr.length > maxLength) {\n    return { isValid: false, error: 'maxLength' }\n  }\n\n  return { isValid: true }\n}\n\n/**\n * Validates minimum decimal precision\n * @param value - The numeric value to validate\n * @param minPrecision - Minimum required decimal places\n * @returns true if valid, false if invalid\n */\nexport function validateMinimumPrecision(\n  value: number,\n  minPrecision: number\n): boolean {\n  if (Number.isInteger(value)) {\n    return false\n  }\n\n  const valueStr = String(value)\n  const decimalIndex = valueStr.indexOf('.')\n\n  if (decimalIndex !== -1) {\n    const decimalPlaces = valueStr.length - decimalIndex - 1\n    return decimalPlaces >= minPrecision\n  }\n\n  return false\n}\n\n/**\n * Helper function to handle length validation errors\n * Returns the appropriate error response based on the validation result\n */\nfunction handleLengthValidationError(\n  lengthCheck: ReturnType<typeof validateStringLength>,\n  helpers: CustomHelpers,\n  custom: string | undefined,\n  minLength: number | undefined,\n  maxLength: number | undefined\n) {\n  if (!lengthCheck.isValid && lengthCheck.error) {\n    const errorType = `number.${lengthCheck.error}`\n\n    if (custom) {\n      // Only pass the relevant length value in context\n      const contextData =\n        lengthCheck.error === 'minLength'\n          ? { minLength: minLength ?? 0 }\n          : { maxLength: maxLength ?? 0 }\n      return helpers.message({ custom }, contextData)\n    }\n\n    const context =\n      lengthCheck.error === 'minLength'\n        ? { minLength: minLength ?? 0 }\n        : { maxLength: maxLength ?? 0 }\n    return helpers.error(errorType, context)\n  }\n  return null\n}\n\nexport function getValidatorPrecision(component: NumberField) {\n  const validator: CustomValidator = (value: number, helpers) => {\n    const { options, schema } = component\n    const { customValidationMessage: custom } = options\n    const {\n      precision: limit,\n      minPrecision,\n      minLength,\n      maxLength\n    } = schema as {\n      precision?: number\n      minPrecision?: number\n      minLength?: number\n      maxLength?: number\n    }\n\n    if (!limit || limit <= 0) {\n      const lengthCheck = validateStringLength(value, minLength, maxLength)\n      const error = handleLengthValidationError(\n        lengthCheck,\n        helpers,\n        custom,\n        minLength,\n        maxLength\n      )\n      if (error) return error\n      return value\n    }\n\n    // Validate precision (max decimal places)\n    const validationSchema = joi\n      .number()\n      .precision(limit)\n      .prefs({ convert: false })\n\n    try {\n      joi.attempt(value, validationSchema)\n    } catch {\n      return custom\n        ? helpers.message({ custom }, { limit })\n        : helpers.error('number.precision', { limit })\n    }\n\n    // Validate minimum precision (min decimal places)\n    if (typeof minPrecision === 'number' && minPrecision > 0) {\n      if (!validateMinimumPrecision(value, minPrecision)) {\n        return helpers.error('number.minPrecision', { minPrecision })\n      }\n    }\n\n    // Check string length validation after precision checks\n    const lengthCheck = validateStringLength(value, minLength, maxLength)\n    const error = handleLengthValidationError(\n      lengthCheck,\n      helpers,\n      custom,\n      minLength,\n      maxLength\n    )\n    if (error) return error\n\n    return value\n  }\n\n  return validator\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"NumberField.js","names":["joi","FormComponent","isFormValue","messageTemplate","NumberField","constructor","def","props","options","schema","formSchema","number","custom","getValidatorPrecision","label","required","allow","messages","customValidationMessages","empty","min","max","precision","integer","customValidationMessage","message","default","stateSchema","getFormValueFromState","state","name","getFormValue","value","isValue","undefined","getViewModel","payload","errors","viewModel","attributes","prefix","suffix","inputmode","text","isNumber","getAllPossibleErrors","baseErrors","type","template","numberInteger","advancedSettingsErrors","numberMin","numberMax","numberPrecision","component","validator","helpers","limit","validationSchema","prefs","convert","attempt","error"],"sources":["../../../../../src/server/plugins/engine/components/NumberField.ts"],"sourcesContent":["import { type NumberFieldComponent } from '@defra/forms-model'\nimport joi, { type CustomValidator, type NumberSchema } from 'joi'\n\nimport {\n  FormComponent,\n  isFormValue\n} from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormPayload,\n  type FormState,\n  type FormStateValue,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\n\nexport class NumberField extends FormComponent {\n  declare options: NumberFieldComponent['options']\n  declare schema: NumberFieldComponent['schema']\n  declare formSchema: NumberSchema\n  declare stateSchema: NumberSchema\n\n  constructor(\n    def: NumberFieldComponent,\n    props: ConstructorParameters<typeof FormComponent>[1]\n  ) {\n    super(def, props)\n\n    const { options, schema } = def\n\n    let formSchema = joi\n      .number()\n      .custom(getValidatorPrecision(this))\n      .label(this.label)\n      .required()\n\n    if (options.required === false) {\n      formSchema = formSchema.allow('')\n    } else {\n      const messages = options.customValidationMessages\n\n      formSchema = formSchema.empty('').messages({\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n        'any.required':\n          messages?.['any.required'] ?? (messageTemplate.required as string)\n      })\n    }\n\n    if (typeof schema.min === 'number') {\n      formSchema = formSchema.min(schema.min)\n    }\n\n    if (typeof schema.max === 'number') {\n      formSchema = formSchema.max(schema.max)\n    }\n\n    if (typeof schema.precision === 'number' && schema.precision <= 0) {\n      formSchema = formSchema.integer()\n    }\n\n    if (options.customValidationMessage) {\n      const message = options.customValidationMessage\n\n      formSchema = formSchema.messages({\n        'any.required': message,\n        'number.base': message,\n        'number.precision': message,\n        'number.integer': message,\n        'number.min': message,\n        'number.max': message\n      })\n    } else if (options.customValidationMessages) {\n      formSchema = formSchema.messages(options.customValidationMessages)\n    }\n\n    this.formSchema = formSchema.default('')\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = options\n    this.schema = schema\n  }\n\n  getFormValueFromState(state: FormSubmissionState) {\n    const { name } = this\n    return this.getFormValue(state[name])\n  }\n\n  getFormValue(value?: FormStateValue | FormState) {\n    return this.isValue(value) ? value : undefined\n  }\n\n  getViewModel(payload: FormPayload, errors?: FormSubmissionError[]) {\n    const { options, schema } = this\n\n    const viewModel = super.getViewModel(payload, errors)\n    let { attributes, prefix, suffix, value } = viewModel\n\n    if (typeof schema.precision === 'undefined' || schema.precision <= 0) {\n      // If precision isn't provided or provided and\n      // less than or equal to 0, use numeric inputmode\n      attributes.inputmode = 'numeric'\n    }\n\n    if (options.prefix) {\n      prefix = {\n        text: options.prefix\n      }\n    }\n\n    if (options.suffix) {\n      suffix = {\n        text: options.suffix\n      }\n    }\n\n    // Allow any `toString()`-able value so non-numeric\n    // values are shown alongside their error messages\n    if (!isFormValue(value)) {\n      value = undefined\n    }\n\n    return {\n      ...viewModel,\n      attributes,\n      prefix,\n      suffix,\n      value\n    }\n  }\n\n  isValue(value?: FormStateValue | FormState) {\n    return NumberField.isNumber(value)\n  }\n\n  /**\n   * For error preview page that shows all possible errors on a component\n   */\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    return NumberField.getAllPossibleErrors()\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors(): ErrorMessageTemplateList {\n    return {\n      baseErrors: [\n        { type: 'required', template: messageTemplate.required },\n        { type: 'numberInteger', template: messageTemplate.numberInteger }\n      ],\n      advancedSettingsErrors: [\n        { type: 'numberMin', template: messageTemplate.numberMin },\n        { type: 'numberMax', template: messageTemplate.numberMax },\n        { type: 'numberPrecision', template: messageTemplate.numberPrecision }\n      ]\n    }\n  }\n\n  static isNumber(value?: FormStateValue | FormState): value is number {\n    return typeof value === 'number'\n  }\n}\n\nexport function getValidatorPrecision(component: NumberField) {\n  const validator: CustomValidator = (value: number, helpers) => {\n    const { options, schema } = component\n\n    const { customValidationMessage: custom } = options\n    const { precision: limit } = schema\n\n    if (!limit || limit <= 0) {\n      return value\n    }\n\n    const validationSchema = joi\n      .number()\n      .precision(limit)\n      .prefs({ convert: false })\n\n    try {\n      return joi.attempt(value, validationSchema)\n    } catch {\n      return custom\n        ? helpers.message({ custom }, { limit })\n        : helpers.error('number.precision', { limit })\n    }\n  }\n\n  return validator\n}\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/engine/components/OsGridRefField.d.ts

@@ -1,12 +1,10 @@
 import { type OsGridRefFieldComponent } from '@defra/forms-model';
-import type joi from 'joi';
 import { LocationFieldBase } from '~/src/server/plugins/engine/components/LocationFieldBase.js';
 export declare class OsGridRefField extends LocationFieldBase {
     options: OsGridRefFieldComponent['options'];
     protected getValidationConfig(): {
         pattern: RegExp;
         patternErrorMessage: string;
-        customValidation: (value: string, helpers: joi.CustomHelpers) => string | joi.ErrorReport;
     };
     protected getErrorTemplates(): {
         type: string;

package/.server/server/plugins/engine/components/OsGridRefField.js

@@ -3,39 +3,11 @@ export class OsGridRefField extends LocationFieldBase {
   getValidationConfig() {
     // Regex for OS grid references and parcel IDs
     // Validates specific valid OS grid letter combinations with:
-    // - 6 digits (e.g., SD865005 or SD 865 005)
-    // - 8 digits in 2 blocks of 4 (parcel ID) e.g., ST 6789 6789
-    // - 10 digits in 2 blocks of 5 (OS grid reference) e.g., SO 12345 12345
-    const osGridPattern = /^(?:[sn][a-hj-z]|[to][abfglmqrvw]|h[l-z]|j[lmqrvw])\s?(?:\d{3}\s?\d{3}|\d{4}\s?\d{4}|\d{5}\s?\d{5})$/i;
-
-    // More permissive pattern for initial validation (allows spaces to be cleaned)
-    const initialPattern = /^[A-Za-z]{2}[\d\s]*$/;
+    // - 2 letters & 6 digits (e.g., SD865005 or SD 865 005)
+    const pattern = /^((([sS]|[nN])[a-hA-Hj-zJ-Z])|(([tT]|[oO])[abfglmqrvwABFGLMQRVW])|([hH][l-zL-Z])|([jJ][lmqrvwLMQRVW]))\s?(([0-9]{3})\s?([0-9]{3}))$/;
     return {
-      pattern: initialPattern,
-      patternErrorMessage: `Enter a valid OS grid reference for ${this.title} like TQ123456`,
-      customValidation: (value, helpers) => {
-        // Strip spaces from the input for processing
-        const cleanValue = value.replace(/\s/g, '');
-        const letters = cleanValue.substring(0, 2);
-        const numbers = cleanValue.substring(2);
-
-        // Validate number length
-        if (numbers.length !== 6 && numbers.length !== 8 && numbers.length !== 10) {
-          return helpers.error('string.pattern.base');
-        }
-
-        // Format with spaces: XX 123 456, XX 1234 5678, or XX 12345 67890
-        const halfLength = numbers.length / 2;
-        const formattedValue = `${letters} ${numbers.substring(0, halfLength)} ${numbers.substring(halfLength)}`;
-
-        // Validate the formatted value against the OS grid pattern
-        if (!osGridPattern.test(formattedValue)) {
-          return helpers.error('string.pattern.base');
-        }
-
-        // Return formatted value with spaces per GDS guidance
-        return formattedValue;
-      }
+      pattern,
+      patternErrorMessage: `Enter a valid OS grid reference for ${this.title} like TQ123456`
     };
   }
   getErrorTemplates() {

package/.server/server/plugins/engine/components/OsGridRefField.js.map

@@ -1 +1 @@
-{"version":3,"file":"OsGridRefField.js","names":["LocationFieldBase","OsGridRefField","getValidationConfig","osGridPattern","initialPattern","pattern","patternErrorMessage","title","customValidation","value","helpers","cleanValue","replace","letters","substring","numbers","length","error","halfLength","formattedValue","test","getErrorTemplates","type","template","getAllPossibleErrors","instance","Object","create","prototype"],"sources":["../../../../../src/server/plugins/engine/components/OsGridRefField.ts"],"sourcesContent":["import { type OsGridRefFieldComponent } from '@defra/forms-model'\nimport type joi from 'joi'\n\nimport { LocationFieldBase } from '~/src/server/plugins/engine/components/LocationFieldBase.js'\n\nexport class OsGridRefField extends LocationFieldBase {\n  declare options: OsGridRefFieldComponent['options']\n\n  protected getValidationConfig() {\n    // Regex for OS grid references and parcel IDs\n    // Validates specific valid OS grid letter combinations with:\n    // - 6 digits (e.g., SD865005 or SD 865 005)\n    // - 8 digits in 2 blocks of 4 (parcel ID) e.g., ST 6789 6789\n    // - 10 digits in 2 blocks of 5 (OS grid reference) e.g., SO 12345 12345\n    const osGridPattern =\n      /^(?:[sn][a-hj-z]|[to][abfglmqrvw]|h[l-z]|j[lmqrvw])\\s?(?:\\d{3}\\s?\\d{3}|\\d{4}\\s?\\d{4}|\\d{5}\\s?\\d{5})$/i\n\n    // More permissive pattern for initial validation (allows spaces to be cleaned)\n    const initialPattern = /^[A-Za-z]{2}[\\d\\s]*$/\n\n    return {\n      pattern: initialPattern,\n      patternErrorMessage: `Enter a valid OS grid reference for ${this.title} like TQ123456`,\n      customValidation: (value: string, helpers: joi.CustomHelpers) => {\n        // Strip spaces from the input for processing\n        const cleanValue = value.replace(/\\s/g, '')\n        const letters = cleanValue.substring(0, 2)\n        const numbers = cleanValue.substring(2)\n\n        // Validate number length\n        if (\n          numbers.length !== 6 &&\n          numbers.length !== 8 &&\n          numbers.length !== 10\n        ) {\n          return helpers.error('string.pattern.base')\n        }\n\n        // Format with spaces: XX 123 456, XX 1234 5678, or XX 12345 67890\n        const halfLength = numbers.length / 2\n        const formattedValue = `${letters} ${numbers.substring(0, halfLength)} ${numbers.substring(halfLength)}`\n\n        // Validate the formatted value against the OS grid pattern\n        if (!osGridPattern.test(formattedValue)) {\n          return helpers.error('string.pattern.base')\n        }\n\n        // Return formatted value with spaces per GDS guidance\n        return formattedValue\n      }\n    }\n  }\n\n  protected getErrorTemplates() {\n    return [\n      {\n        type: 'pattern',\n        template:\n          'Enter a valid OS grid reference for [short description] like TQ123456'\n      }\n    ]\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors() {\n    const instance = Object.create(OsGridRefField.prototype) as OsGridRefField\n    return instance.getAllPossibleErrors()\n  }\n}\n"],"mappings":"AAGA,SAASA,iBAAiB;AAE1B,OAAO,MAAMC,cAAc,SAASD,iBAAiB,CAAC;EAG1CE,mBAAmBA,CAAA,EAAG;IAC9B;IACA;IACA;IACA;IACA;IACA,MAAMC,aAAa,GACjB,uGAAuG;;IAEzG;IACA,MAAMC,cAAc,GAAG,sBAAsB;IAE7C,OAAO;MACLC,OAAO,EAAED,cAAc;MACvBE,mBAAmB,EAAE,uCAAuC,IAAI,CAACC,KAAK,gBAAgB;MACtFC,gBAAgB,EAAEA,CAACC,KAAa,EAAEC,OAA0B,KAAK;QAC/D;QACA,MAAMC,UAAU,GAAGF,KAAK,CAACG,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QAC3C,MAAMC,OAAO,GAAGF,UAAU,CAACG,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1C,MAAMC,OAAO,GAAGJ,UAAU,CAACG,SAAS,CAAC,CAAC,CAAC;;QAEvC;QACA,IACEC,OAAO,CAACC,MAAM,KAAK,CAAC,IACpBD,OAAO,CAACC,MAAM,KAAK,CAAC,IACpBD,OAAO,CAACC,MAAM,KAAK,EAAE,EACrB;UACA,OAAON,OAAO,CAACO,KAAK,CAAC,qBAAqB,CAAC;QAC7C;;QAEA;QACA,MAAMC,UAAU,GAAGH,OAAO,CAACC,MAAM,GAAG,CAAC;QACrC,MAAMG,cAAc,GAAG,GAAGN,OAAO,IAAIE,OAAO,CAACD,SAAS,CAAC,CAAC,EAAEI,UAAU,CAAC,IAAIH,OAAO,CAACD,SAAS,CAACI,UAAU,CAAC,EAAE;;QAExG;QACA,IAAI,CAACf,aAAa,CAACiB,IAAI,CAACD,cAAc,CAAC,EAAE;UACvC,OAAOT,OAAO,CAACO,KAAK,CAAC,qBAAqB,CAAC;QAC7C;;QAEA;QACA,OAAOE,cAAc;MACvB;IACF,CAAC;EACH;EAEUE,iBAAiBA,CAAA,EAAG;IAC5B,OAAO,CACL;MACEC,IAAI,EAAE,SAAS;MACfC,QAAQ,EACN;IACJ,CAAC,CACF;EACH;;EAEA;AACF;AACA;EACE,OAAOC,oBAAoBA,CAAA,EAAG;IAC5B,MAAMC,QAAQ,GAAGC,MAAM,CAACC,MAAM,CAAC1B,cAAc,CAAC2B,SAAS,CAAmB;IAC1E,OAAOH,QAAQ,CAACD,oBAAoB,CAAC,CAAC;EACxC;AACF","ignoreList":[]}
+{"version":3,"file":"OsGridRefField.js","names":["LocationFieldBase","OsGridRefField","getValidationConfig","pattern","patternErrorMessage","title","getErrorTemplates","type","template","getAllPossibleErrors","instance","Object","create","prototype"],"sources":["../../../../../src/server/plugins/engine/components/OsGridRefField.ts"],"sourcesContent":["import { type OsGridRefFieldComponent } from '@defra/forms-model'\n\nimport { LocationFieldBase } from '~/src/server/plugins/engine/components/LocationFieldBase.js'\n\nexport class OsGridRefField extends LocationFieldBase {\n  declare options: OsGridRefFieldComponent['options']\n\n  protected getValidationConfig() {\n    // Regex for OS grid references and parcel IDs\n    // Validates specific valid OS grid letter combinations with:\n    // - 2 letters & 6 digits (e.g., SD865005 or SD 865 005)\n    const pattern =\n      /^((([sS]|[nN])[a-hA-Hj-zJ-Z])|(([tT]|[oO])[abfglmqrvwABFGLMQRVW])|([hH][l-zL-Z])|([jJ][lmqrvwLMQRVW]))\\s?(([0-9]{3})\\s?([0-9]{3}))$/\n\n    return {\n      pattern,\n      patternErrorMessage: `Enter a valid OS grid reference for ${this.title} like TQ123456`\n    }\n  }\n\n  protected getErrorTemplates() {\n    return [\n      {\n        type: 'pattern',\n        template:\n          'Enter a valid OS grid reference for [short description] like TQ123456'\n      }\n    ]\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors() {\n    const instance = Object.create(OsGridRefField.prototype) as OsGridRefField\n    return instance.getAllPossibleErrors()\n  }\n}\n"],"mappings":"AAEA,SAASA,iBAAiB;AAE1B,OAAO,MAAMC,cAAc,SAASD,iBAAiB,CAAC;EAG1CE,mBAAmBA,CAAA,EAAG;IAC9B;IACA;IACA;IACA,MAAMC,OAAO,GACX,qIAAqI;IAEvI,OAAO;MACLA,OAAO;MACPC,mBAAmB,EAAE,uCAAuC,IAAI,CAACC,KAAK;IACxE,CAAC;EACH;EAEUC,iBAAiBA,CAAA,EAAG;IAC5B,OAAO,CACL;MACEC,IAAI,EAAE,SAAS;MACfC,QAAQ,EACN;IACJ,CAAC,CACF;EACH;;EAEA;AACF;AACA;EACE,OAAOC,oBAAoBA,CAAA,EAAG;IAC5B,MAAMC,QAAQ,GAAGC,MAAM,CAACC,MAAM,CAACX,cAAc,CAACY,SAAS,CAAmB;IAC1E,OAAOH,QAAQ,CAACD,oBAAoB,CAAC,CAAC;EACxC;AACF","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "description": "Defra forms engine",
   "type": "module",
   "files": [

package/src/server/forms/register-as-a-unicorn-breeder.yaml

@@ -203,7 +203,7 @@ pages:
     path: '/how-many-members-of-staff-will-look-after-the-unicorns'
     section: susaYr
     next:
-      - path: '/summary'
+      - path: '/declaration'
     components:
       - name: zhJMaM
         options:
@@ -219,7 +219,7 @@ pages:
     controller: FileUploadPageController
     section: Regnsa
     next:
-      - path: '/declaration'
+      - path: '/how-many-unicorns-do-you-expect-to-breed-each-year'
     components:
       - name: dLzALM
         title: Documents

package/src/server/plugins/engine/components/EastingNorthingField.test.ts

@@ -556,14 +556,7 @@ describe('EastingNorthingField', () => {
                 easting: 12345.5,
                 northing: 1234567
               }),
-              // Two errors expected: decimal input triggers both integer validation
-              // and length validation ('12345.5' is 7 chars, max is 6)
               errors: [
-                expect.objectContaining({
-                  text: expect.stringMatching(
-                    /Easting for .* must be between 1 and 6 digits/
-                  )
-                }),
                 expect.objectContaining({
                   text: expect.stringMatching(
                     /Easting for .* must be between 1 and 6 digits/
@@ -582,14 +575,7 @@ describe('EastingNorthingField', () => {
                 easting: 12345,
                 northing: 1234567.5
               }),
-              // Two errors expected: decimal input triggers both integer validation
-              // and length validation ('1234567.5' is 9 chars, max is 7)
               errors: [
-                expect.objectContaining({
-                  text: expect.stringMatching(
-                    /Northing for .* must be between 1 and 7 digits/
-                  )
-                }),
                 expect.objectContaining({
                   text: expect.stringMatching(
                     /Northing for .* must be between 1 and 7 digits/

package/src/server/plugins/engine/components/EastingNorthingField.ts

@@ -32,18 +32,6 @@ const DEFAULT_EASTING_MAX = 700000
 const DEFAULT_NORTHING_MIN = 0
 const DEFAULT_NORTHING_MAX = 1300000
 
-// Easting length constraints (integer values only, no decimals)
-// Min: 1 char for values like "0" or single digit values
-// Max: 6 chars for values up to 700000 (British National Grid easting limit)
-const EASTING_MIN_LENGTH = 1
-const EASTING_MAX_LENGTH = 6
-
-// Northing length constraints (integer values only, no decimals)
-// Min: 1 char for values like "0" or single digit values
-// Max: 7 chars for values up to 1300000 (British National Grid northing limit)
-const NORTHING_MIN_LENGTH = 1
-const NORTHING_MAX_LENGTH = 7
-
 export class EastingNorthingField extends FormComponent {
   declare options: EastingNorthingFieldComponent['options']
   declare formSchema: ObjectSchema<FormPayload>
@@ -73,9 +61,7 @@ export class EastingNorthingField extends FormComponent {
         'number.max': `{{#label}} for ${this.title} must be between ${eastingMin} and {{#limit}}`,
         'number.precision': `{{#label}} for ${this.title} must be between 1 and 6 digits`,
         'number.integer': `{{#label}} for ${this.title} must be between 1 and 6 digits`,
-        'number.unsafe': `{{#label}} for ${this.title} must be between 1 and 6 digits`,
-        'number.minLength': `{{#label}} for ${this.title} must be between 1 and 6 digits`,
-        'number.maxLength': `{{#label}} for ${this.title} must be between 1 and 6 digits`
+        'number.unsafe': `{{#label}} for ${this.title} must be between 1 and 6 digits`
       })
 
     const northingValidationMessages: LanguageMessages =
@@ -86,9 +72,7 @@ export class EastingNorthingField extends FormComponent {
         'number.max': `{{#label}} for ${this.title} must be between ${northingMin} and {{#limit}}`,
         'number.precision': `{{#label}} for ${this.title} must be between 1 and 7 digits`,
         'number.integer': `{{#label}} for ${this.title} must be between 1 and 7 digits`,
-        'number.unsafe': `{{#label}} for ${this.title} must be between 1 and 7 digits`,
-        'number.minLength': `{{#label}} for ${this.title} must be between 1 and 7 digits`,
-        'number.maxLength': `{{#label}} for ${this.title} must be between 1 and 7 digits`
+        'number.unsafe': `{{#label}} for ${this.title} must be between 1 and 7 digits`
       })
 
     this.collection = new ComponentCollection(
@@ -100,9 +84,7 @@ export class EastingNorthingField extends FormComponent {
           schema: {
             min: eastingMin,
             max: eastingMax,
-            precision: 0,
-            minLength: EASTING_MIN_LENGTH,
-            maxLength: EASTING_MAX_LENGTH
+            precision: 0
           },
           options: {
             required: isRequired,
@@ -118,9 +100,7 @@ export class EastingNorthingField extends FormComponent {
           schema: {
             min: northingMin,
             max: northingMax,
-            precision: 0,
-            minLength: NORTHING_MIN_LENGTH,
-            maxLength: NORTHING_MAX_LENGTH
+            precision: 0
           },
           options: {
             required: isRequired,

package/src/server/plugins/engine/components/LatLongField.test.ts

@@ -149,7 +149,7 @@ describe('LatLongField', () => {
 
         const result2 = collection.validate(
           getFormData({
-            latitude: '49.1',
+            latitude: '50.5',
             longitude: '-8.9'
           })
         )
@@ -578,15 +578,7 @@ describe('LatLongField', () => {
               value: getFormData({
                 latitude: 52,
                 longitude: -1
-              }),
-              errors: [
-                expect.objectContaining({
-                  text: 'Latitude must have at least 1 decimal place'
-                }),
-                expect.objectContaining({
-                  text: 'Longitude must have at least 1 decimal place'
-                })
-              ]
+              })
             }
           },
           {
@@ -619,7 +611,6 @@ describe('LatLongField', () => {
         description: 'Length and precision validation',
         component: createLatLongComponent(),
         assertions: [
-          // Latitude too short
           {
             input: getFormData({
               latitude: '52',
@@ -629,12 +620,7 @@ describe('LatLongField', () => {
               value: getFormData({
                 latitude: 52,
                 longitude: -1.5
-              }),
-              errors: [
-                expect.objectContaining({
-                  text: 'Latitude must have at least 1 decimal place'
-                })
-              ]
+              })
             }
           },
           // Latitude too long
@@ -655,7 +641,6 @@ describe('LatLongField', () => {
               ]
             }
           },
-          // Longitude too short
           {
             input: getFormData({
               latitude: '52.1',
@@ -665,12 +650,7 @@ describe('LatLongField', () => {
               value: getFormData({
                 latitude: 52.1,
                 longitude: -1
-              }),
-              errors: [
-                expect.objectContaining({
-                  text: 'Longitude must have at least 1 decimal place'
-                })
-              ]
+              })
             }
           },
           // Longitude too long

package/src/server/plugins/engine/components/LatLongField.ts

@@ -26,19 +26,6 @@ import { convertToLanguageMessages } from '~/src/server/utils/type-utils.js'
 // Precision constants
 // UK latitude/longitude requires high precision for accurate location (within ~11mm)
 const DECIMAL_PRECISION = 7 // 7 decimal places
-const MIN_DECIMAL_PLACES = 1 // At least 1 decimal place required
-
-// Latitude length constraints
-// Min: 3 chars for values like "52.1" (2 digits + decimal + 1 decimal place)
-// Max: 10 chars for values like "59.1234567" (2 digits + decimal + 7 decimal places)
-const LATITUDE_MIN_LENGTH = 3
-const LATITUDE_MAX_LENGTH = 10
-
-// Longitude length constraints
-// Min: 2 chars for values like "-1" or single digit with decimal (needs min decimal places)
-// Max: 10 chars for values like "-1.1234567" (minus + 1 digit + decimal + 7 decimal places)
-const LONGITUDE_MIN_LENGTH = 2
-const LONGITUDE_MAX_LENGTH = 10
 
 export class LatLongField extends FormComponent {
   declare options: LatLongFieldComponent['options']
@@ -57,10 +44,10 @@ export class LatLongField extends FormComponent {
     const isRequired = options.required !== false
 
     // Read schema values from def.schema with fallback defaults
-    const latitudeMin = schema?.latitude?.min ?? 49
-    const latitudeMax = schema?.latitude?.max ?? 60
-    const longitudeMin = schema?.longitude?.min ?? -9
-    const longitudeMax = schema?.longitude?.max ?? 2
+    const latitudeMin = schema?.latitude?.min ?? 49.85
+    const latitudeMax = schema?.latitude?.max ?? 60.859
+    const longitudeMin = schema?.longitude?.min ?? -13.687
+    const longitudeMax = schema?.longitude?.max ?? 1.767
 
     const customValidationMessages: LanguageMessages =
       convertToLanguageMessages({
@@ -68,8 +55,6 @@ export class LatLongField extends FormComponent {
         'number.base': messageTemplate.objectMissing,
         'number.precision':
           '{{#label}} must have no more than 7 decimal places',
-        'number.minPrecision':
-          '{{#label}} must have at least {{#minPrecision}} decimal place',
         'number.unsafe': '{{#label}} must be a valid number'
       })
 
@@ -77,18 +62,14 @@ export class LatLongField extends FormComponent {
       ...customValidationMessages,
       'number.base': `Enter a valid latitude for ${this.title} like 51.519450`,
       'number.min': `Latitude for ${this.title} must be between ${latitudeMin} and ${latitudeMax}`,
-      'number.max': `Latitude for ${this.title} must be between ${latitudeMin} and ${latitudeMax}`,
-      'number.minLength': `Latitude for ${this.title} must be between 3 and 10 characters`,
-      'number.maxLength': `Latitude for ${this.title} must be between 3 and 10 characters`
+      'number.max': `Latitude for ${this.title} must be between ${latitudeMin} and ${latitudeMax}`
     })
 
     const longitudeMessages: LanguageMessages = convertToLanguageMessages({
       ...customValidationMessages,
       'number.base': `Enter a valid longitude for ${this.title} like -0.127758`,
       'number.min': `Longitude for ${this.title} must be between ${longitudeMin} and ${longitudeMax}`,
-      'number.max': `Longitude for ${this.title} must be between ${longitudeMin} and ${longitudeMax}`,
-      'number.minLength': `Longitude for ${this.title} must be between 2 and 10 characters`,
-      'number.maxLength': `Longitude for ${this.title} must be between 2 and 10 characters`
+      'number.max': `Longitude for ${this.title} must be between ${longitudeMin} and ${longitudeMax}`
     })
 
     this.collection = new ComponentCollection(
@@ -100,10 +81,7 @@ export class LatLongField extends FormComponent {
           schema: {
             min: latitudeMin,
             max: latitudeMax,
-            precision: DECIMAL_PRECISION,
-            minPrecision: MIN_DECIMAL_PLACES,
-            minLength: LATITUDE_MIN_LENGTH,
-            maxLength: LATITUDE_MAX_LENGTH
+            precision: DECIMAL_PRECISION
           },
           options: {
             required: isRequired,
@@ -120,10 +98,7 @@ export class LatLongField extends FormComponent {
           schema: {
             min: longitudeMin,
             max: longitudeMax,
-            precision: DECIMAL_PRECISION,
-            minPrecision: MIN_DECIMAL_PLACES,
-            minLength: LONGITUDE_MIN_LENGTH,
-            maxLength: LONGITUDE_MAX_LENGTH
+            precision: DECIMAL_PRECISION
           },
           options: {
             required: isRequired,

package/src/server/plugins/engine/components/LocationFieldBase.ts

@@ -28,11 +28,6 @@ interface LocationFieldOptions {
 interface ValidationConfig {
   pattern: RegExp
   patternErrorMessage: string
-  customValidation?: (
-    value: string,
-    helpers: joi.CustomHelpers
-  ) => string | joi.ErrorReport
-  additionalMessages?: LanguageMessages
 }
 
 /**
@@ -71,14 +66,9 @@ export abstract class LocationFieldBase extends FormComponent {
       .required()
       .pattern(config.pattern)
       .messages({
-        'string.pattern.base': config.patternErrorMessage,
-        ...config.additionalMessages
+        'string.pattern.base': config.patternErrorMessage
       })
 
-    if (config.customValidation) {
-      formSchema = formSchema.custom(config.customValidation)
-    }
-
     if (locationOptions.required === false) {
       formSchema = formSchema.allow('')
     }
@@ -91,10 +81,6 @@ export abstract class LocationFieldBase extends FormComponent {
         'string.pattern.base'
       ]
 
-      if (config.additionalMessages) {
-        messageKeys.push(...Object.keys(config.additionalMessages))
-      }
-
       const messages = messageKeys.reduce<LanguageMessages>((acc, key) => {
         acc[key] = message
         return acc

package/src/server/plugins/engine/components/NationalGridFieldNumberField.test.ts

@@ -99,13 +99,27 @@ describe('NationalGridFieldNumberField', () => {
       })
 
       it('accepts valid values', () => {
-        const result1 = collection.validate(getFormData('NG12345678'))
-        const result2 = collection.validate(getFormData('ng12345678'))
-        const result3 = collection.validate(getFormData('AB98765432'))
+        // Test 8-digit parcel ID format (2x4)
+        const result1 = collection.validate(getFormData('TQ12345678'))
+        const result2 = collection.validate(getFormData('TQ 1234 5678'))
+
+        // Test 10-digit OS grid reference format (2x5)
+        const result3 = collection.validate(getFormData('SU1234567890'))
+        const result4 = collection.validate(getFormData('SU 12345 67890'))
+
+        expect(result1.errors).toBeUndefined()
+        expect(result2.errors).toBeUndefined()
+        expect(result3.errors).toBeUndefined()
+        expect(result4.errors).toBeUndefined()
+
+        // Test case-insensitive
+        const result5 = collection.validate(getFormData('nt12345678'))
 
         expect(result1.errors).toBeUndefined()
         expect(result2.errors).toBeUndefined()
         expect(result3.errors).toBeUndefined()
+        expect(result4.errors).toBeUndefined()
+        expect(result5.errors).toBeUndefined()
       })
 
       it('formats values with spaces per GDS guidance', () => {
@@ -114,8 +128,8 @@ describe('NationalGridFieldNumberField', () => {
         const result3 = collection.validate(getFormData('NG12345,678'))
 
         expect(result1.value.myComponent).toBe('NG 1234 5678')
-        expect(result2.value.myComponent).toBe('NG 1234 5678')
-        expect(result3.value.myComponent).toBe('NG 1234 5678')
+        expect(result2.value.myComponent).toBe('NG12345678')
+        expect(result3.value.myComponent).toBe('NG12345,678')
       })
 
       it('adds errors for empty value', () => {
@@ -258,15 +272,15 @@ describe('NationalGridFieldNumberField', () => {
         assertions: [
           {
             input: getFormData('  NG12345678'),
-            output: { value: getFormData('NG 1234 5678') }
+            output: { value: getFormData('NG12345678') }
           },
           {
             input: getFormData('NG12345678  '),
-            output: { value: getFormData('NG 1234 5678') }
+            output: { value: getFormData('NG12345678') }
           },
           {
             input: getFormData('  NG12345678 \n\n'),
-            output: { value: getFormData('NG 1234 5678') }
+            output: { value: getFormData('NG12345678') }
           }
         ]
       },

package/src/server/plugins/engine/components/NationalGridFieldNumberField.ts

@@ -1,5 +1,4 @@
 import { type NationalGridFieldNumberFieldComponent } from '@defra/forms-model'
-import type joi from 'joi'
 
 import { LocationFieldBase } from '~/src/server/plugins/engine/components/LocationFieldBase.js'
 
@@ -7,26 +6,16 @@ export class NationalGridFieldNumberField extends LocationFieldBase {
   declare options: NationalGridFieldNumberFieldComponent['options']
 
   protected getValidationConfig() {
-    return {
-      // Pattern allows spaces and commas in the input since custom validation will clean them
-      pattern: /^[A-Z]{2}[\d\s,]*$/i,
-      patternErrorMessage: `Enter a valid National Grid field number for ${this.title} like NG 1234 5678`,
-      customValidation: (value: string, helpers: joi.CustomHelpers) => {
-        // Strip spaces and commas for validation
-        const cleanValue = value.replace(/[\s,]/g, '')
-
-        // Check if it matches the exact pattern after cleaning
-        if (!/^[A-Z]{2}\d{8}$/i.test(cleanValue)) {
-          return helpers.error('string.pattern.base')
-        }
-
-        // Format with spaces per GDS guidance: NG 1234 5678
-        const letters = cleanValue.substring(0, 2)
-        const numbers = cleanValue.substring(2)
-        const formattedValue = `${letters} ${numbers.substring(0, 4)} ${numbers.substring(4)}`
+    // Regex for OS grid references and parcel IDs
+    // Validates specific valid OS grid letter combinations with:
+    // - 2 letters & 8 digits in 2 blocks of 4 (parcel ID) e.g., ST 6789 6789
+    // - 2 letters & 10 digits in 2 blocks of 5 (OS grid reference) e.g., SO 12345 12345
+    const pattern =
+      /^((([sS]|[nN])[a-hA-Hj-zJ-Z])|(([tT]|[oO])[abfglmqrvwABFGLMQRVW])|([hH][l-zL-Z])|([jJ][lmqrvwLMQRVW]))\s?(([0-9]{4})\s?([0-9]{4})|([0-9]{5})\s?([0-9]{5}))$/
 
-        return formattedValue
-      }
+    return {
+      pattern,
+      patternErrorMessage: `Enter a valid National Grid field number for ${this.title} like NG 1234 5678`
     }
   }