@defra/forms-engine-plugin 4.0.6 → 4.0.8

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

@@ -0,0 +1,85 @@
+import joi from 'joi';
+import { FormComponent, isFormValue } from "./FormComponent.js";
+import { addClassOptionIfNone } from "./helpers/index.js";
+import { markdown } from "./markdownParser.js";
+import { messageTemplate } from "../pageControllers/validationOptions.js";
+/**
+ * Abstract base class for location-based field components
+ */
+export class LocationFieldBase extends FormComponent {
+  instructionText;
+  constructor(def, props) {
+    super(def, props);
+    const {
+      options
+    } = def;
+    const locationOptions = options;
+    this.instructionText = locationOptions.instructionText;
+    addClassOptionIfNone(locationOptions, 'govuk-input--width-10');
+    const config = this.getValidationConfig();
+    let formSchema = joi.string().trim().label(this.label).required().pattern(config.pattern).messages({
+      'string.pattern.base': config.patternErrorMessage,
+      ...config.additionalMessages
+    });
+    if (config.customValidation) {
+      formSchema = formSchema.custom(config.customValidation);
+    }
+    if (locationOptions.required === false) {
+      formSchema = formSchema.allow('');
+    }
+    if (locationOptions.customValidationMessage) {
+      const message = locationOptions.customValidationMessage;
+      const messageKeys = ['any.required', 'string.empty', 'string.pattern.base'];
+      if (config.additionalMessages) {
+        messageKeys.push(...Object.keys(config.additionalMessages));
+      }
+      const messages = messageKeys.reduce((acc, key) => {
+        acc[key] = message;
+        return acc;
+      }, {});
+      formSchema = formSchema.messages(messages);
+    } else if (locationOptions.customValidationMessages) {
+      formSchema = formSchema.messages(locationOptions.customValidationMessages);
+    }
+    this.formSchema = formSchema.default('');
+    this.stateSchema = formSchema.default(null).allow(null);
+    this.options = locationOptions;
+  }
+  getFormValueFromState(state) {
+    const {
+      name
+    } = this;
+    return this.getFormValue(state[name]);
+  }
+  getFormValue(value) {
+    return this.isValue(value) ? value : undefined;
+  }
+  isValue(value) {
+    return LocationFieldBase.isText(value);
+  }
+  getViewModel(payload, errors) {
+    const viewModel = super.getViewModel(payload, errors);
+    if (this.instructionText) {
+      return {
+        ...viewModel,
+        instructionText: markdown.parse(this.instructionText, {
+          async: false
+        })
+      };
+    }
+    return viewModel;
+  }
+  getAllPossibleErrors() {
+    return {
+      baseErrors: [{
+        type: 'required',
+        template: messageTemplate.required
+      }, ...this.getErrorTemplates()],
+      advancedSettingsErrors: []
+    };
+  }
+  static isText(value) {
+    return isFormValue(value) && typeof value === 'string';
+  }
+}
+//# sourceMappingURL=LocationFieldBase.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"LocationFieldBase.js","names":["joi","FormComponent","isFormValue","addClassOptionIfNone","markdown","messageTemplate","LocationFieldBase","instructionText","constructor","def","props","options","locationOptions","config","getValidationConfig","formSchema","string","trim","label","required","pattern","messages","patternErrorMessage","additionalMessages","customValidation","custom","allow","customValidationMessage","message","messageKeys","push","Object","keys","reduce","acc","key","customValidationMessages","default","stateSchema","getFormValueFromState","state","name","getFormValue","value","isValue","undefined","isText","getViewModel","payload","errors","viewModel","parse","async","getAllPossibleErrors","baseErrors","type","template","getErrorTemplates","advancedSettingsErrors"],"sources":["../../../../../src/server/plugins/engine/components/LocationFieldBase.ts"],"sourcesContent":["import { type FormComponentsDef } from '@defra/forms-model'\nimport joi, { type LanguageMessages, type StringSchema } from 'joi'\n\nimport {\n  FormComponent,\n  isFormValue\n} from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { addClassOptionIfNone } from '~/src/server/plugins/engine/components/helpers/index.js'\nimport { markdown } from '~/src/server/plugins/engine/components/markdownParser.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\ninterface LocationFieldOptions {\n  instructionText?: string\n  required?: boolean\n  customValidationMessage?: string\n  customValidationMessages?: LanguageMessages\n  classes?: string\n}\n\ninterface ValidationConfig {\n  pattern: RegExp\n  patternErrorMessage: string\n  customValidation?: (\n    value: string,\n    helpers: joi.CustomHelpers\n  ) => string | joi.ErrorReport\n  additionalMessages?: LanguageMessages\n}\n\n/**\n * Abstract base class for location-based field components\n */\nexport abstract class LocationFieldBase extends FormComponent {\n  declare options: LocationFieldOptions\n  declare formSchema: StringSchema\n  declare stateSchema: StringSchema\n  instructionText?: string\n\n  protected abstract getValidationConfig(): ValidationConfig\n  protected abstract getErrorTemplates(): {\n    type: string\n    template: string\n  }[]\n\n  constructor(\n    def: FormComponentsDef,\n    props: ConstructorParameters<typeof FormComponent>[1]\n  ) {\n    super(def, props)\n\n    const { options } = def\n    const locationOptions = options as LocationFieldOptions\n    this.instructionText = locationOptions.instructionText\n\n    addClassOptionIfNone(locationOptions, 'govuk-input--width-10')\n\n    const config = this.getValidationConfig()\n\n    let formSchema = joi\n      .string()\n      .trim()\n      .label(this.label)\n      .required()\n      .pattern(config.pattern)\n      .messages({\n        'string.pattern.base': config.patternErrorMessage,\n        ...config.additionalMessages\n      })\n\n    if (config.customValidation) {\n      formSchema = formSchema.custom(config.customValidation)\n    }\n\n    if (locationOptions.required === false) {\n      formSchema = formSchema.allow('')\n    }\n\n    if (locationOptions.customValidationMessage) {\n      const message = locationOptions.customValidationMessage\n      const messageKeys = [\n        'any.required',\n        'string.empty',\n        'string.pattern.base'\n      ]\n\n      if (config.additionalMessages) {\n        messageKeys.push(...Object.keys(config.additionalMessages))\n      }\n\n      const messages = messageKeys.reduce<LanguageMessages>((acc, key) => {\n        acc[key] = message\n        return acc\n      }, {})\n\n      formSchema = formSchema.messages(messages)\n    } else if (locationOptions.customValidationMessages) {\n      formSchema = formSchema.messages(locationOptions.customValidationMessages)\n    }\n\n    this.formSchema = formSchema.default('')\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = locationOptions\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  isValue(value?: FormStateValue | FormState): value is string {\n    return LocationFieldBase.isText(value)\n  }\n\n  getViewModel(payload: FormPayload, errors?: FormSubmissionError[]) {\n    const viewModel = super.getViewModel(payload, errors)\n\n    if (this.instructionText) {\n      return {\n        ...viewModel,\n        instructionText: markdown.parse(this.instructionText, { async: false })\n      }\n    }\n\n    return viewModel\n  }\n\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    return {\n      baseErrors: [\n        { type: 'required', template: messageTemplate.required },\n        ...this.getErrorTemplates()\n      ],\n      advancedSettingsErrors: []\n    }\n  }\n\n  static isText(value?: FormStateValue | FormState): value is string {\n    return isFormValue(value) && typeof value === 'string'\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,108 @@
+import { type CustomValidator } from 'joi';
+import { type EastingNorthingField } from '~/src/server/plugins/engine/components/EastingNorthingField.js';
+import { type LatLongField } from '~/src/server/plugins/engine/components/LatLongField.js';
+import { type DateInputItem, type Label, type ViewModel } from '~/src/server/plugins/engine/components/types.js';
+import { type FormPayload, type FormSubmissionError, type FormValue } from '~/src/server/plugins/engine/types.js';
+export type LocationField = InstanceType<typeof EastingNorthingField> | InstanceType<typeof LatLongField>;
+export declare function getLocationFieldViewModel(component: LocationField, viewModel: ViewModel & {
+    label: Label;
+    id: string;
+    name: string;
+    value: FormValue;
+}, payload: FormPayload, errors?: FormSubmissionError[]): {
+    fieldset: {
+        attributes?: string | Record<string, string>;
+        legend?: Label;
+    };
+    items: DateInputItem[];
+    label: Label;
+    type?: string;
+    id: string;
+    name: string;
+    value: FormValue;
+    hint?: {
+        id?: string;
+        text: string;
+    };
+    prefix?: import("~/src/server/plugins/engine/components/types.js").ComponentText;
+    suffix?: import("~/src/server/plugins/engine/components/types.js").ComponentText;
+    classes?: string;
+    condition?: string;
+    errors?: FormSubmissionError[];
+    errorMessage?: {
+        text: string;
+    };
+    summaryHtml?: string;
+    html?: string;
+    attributes: {
+        autocomplete?: string;
+        maxlength?: number;
+        multiple?: string;
+        accept?: string;
+        inputmode?: string;
+    };
+    content?: import("~/src/server/plugins/engine/components/types.js").Content | import("~/src/server/plugins/engine/components/types.js").Content[] | string;
+    maxlength?: number;
+    maxwords?: number;
+    rows?: number;
+    formGroup?: {
+        classes?: string;
+        attributes?: string | Record<string, string>;
+    };
+    components?: import("~/src/server/plugins/engine/components/types.js").ComponentViewModel[];
+    upload?: {
+        count: number;
+        summaryList: import("~/src/server/plugins/engine/types.js").SummaryList;
+    };
+} | {
+    instructionText: string;
+    fieldset: {
+        attributes?: string | Record<string, string>;
+        legend?: Label;
+    };
+    items: DateInputItem[];
+    label: Label;
+    type?: string;
+    id: string;
+    name: string;
+    value: FormValue;
+    hint?: {
+        id?: string;
+        text: string;
+    };
+    prefix?: import("~/src/server/plugins/engine/components/types.js").ComponentText;
+    suffix?: import("~/src/server/plugins/engine/components/types.js").ComponentText;
+    classes?: string;
+    condition?: string;
+    errors?: FormSubmissionError[];
+    errorMessage?: {
+        text: string;
+    };
+    summaryHtml?: string;
+    html?: string;
+    attributes: {
+        autocomplete?: string;
+        maxlength?: number;
+        multiple?: string;
+        accept?: string;
+        inputmode?: string;
+    };
+    content?: import("~/src/server/plugins/engine/components/types.js").Content | import("~/src/server/plugins/engine/components/types.js").Content[] | string;
+    maxlength?: number;
+    maxwords?: number;
+    rows?: number;
+    formGroup?: {
+        classes?: string;
+        attributes?: string | Record<string, string>;
+    };
+    components?: import("~/src/server/plugins/engine/components/types.js").ComponentViewModel[];
+    upload?: {
+        count: number;
+        summaryList: import("~/src/server/plugins/engine/types.js").SummaryList;
+    };
+};
+/**
+ * Validator factory for location-based fields.
+ * This creates a validator that ensures all required fields are present.
+ */
+export declare function createLocationFieldValidator(component: LocationField): CustomValidator;

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

@@ -0,0 +1,96 @@
+import { isFormValue } from "./FormComponent.js";
+import { markdown } from "./markdownParser.js";
+export function getLocationFieldViewModel(component, viewModel, payload, errors) {
+  const {
+    collection,
+    name
+  } = component;
+  const {
+    fieldset: existingFieldset,
+    label
+  } = viewModel;
+
+  // Check for component errors only
+  const hasError = errors?.some(error => error.name === name);
+
+  // Use the component collection to generate the subitems
+  const items = collection.getViewModel(payload, errors).map(({
+    model
+  }) => {
+    let {
+      label,
+      type,
+      value,
+      classes,
+      prefix,
+      suffix,
+      errorMessage
+    } = model;
+    if (label) {
+      label.toString = () => label.text; // Use string labels
+    }
+    if (hasError || errorMessage) {
+      classes = `${classes ?? ''} govuk-input--error`.trim();
+    }
+
+    // Allow any `toString()`-able value so non-numeric
+    // values are shown alongside their error messages
+    if (!isFormValue(value)) {
+      value = undefined;
+    }
+    return {
+      label,
+      id: model.id,
+      name: model.name,
+      type,
+      value,
+      classes,
+      prefix,
+      suffix
+    };
+  });
+  const fieldset = existingFieldset ?? {
+    legend: {
+      text: label.text,
+      classes: 'govuk-fieldset__legend--m'
+    }
+  };
+  const result = {
+    ...viewModel,
+    fieldset,
+    items
+  };
+  if (component.options.instructionText) {
+    return {
+      ...result,
+      instructionText: markdown.parse(component.options.instructionText, {
+        async: false
+      })
+    };
+  }
+  return result;
+}
+
+/**
+ * Validator factory for location-based fields.
+ * This creates a validator that ensures all required fields are present.
+ */
+export function createLocationFieldValidator(component) {
+  return (payload, helpers) => {
+    const {
+      collection,
+      name,
+      options
+    } = component;
+    const values = component.getFormValueFromState(component.getStateFromValidForm(payload));
+    const context = {
+      missing: collection.keys,
+      key: name
+    };
+    if (!component.isState(values)) {
+      return options.required !== false ? helpers.error('object.required', context) : payload;
+    }
+    return payload;
+  };
+}
+//# sourceMappingURL=LocationFieldHelpers.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"LocationFieldHelpers.js","names":["isFormValue","markdown","getLocationFieldViewModel","component","viewModel","payload","errors","collection","name","fieldset","existingFieldset","label","hasError","some","error","items","getViewModel","map","model","type","value","classes","prefix","suffix","errorMessage","toString","text","trim","undefined","id","legend","result","options","instructionText","parse","async","createLocationFieldValidator","helpers","values","getFormValueFromState","getStateFromValidForm","context","missing","keys","key","isState","required"],"sources":["../../../../../src/server/plugins/engine/components/LocationFieldHelpers.ts"],"sourcesContent":["import { type Context, type CustomValidator } from 'joi'\n\nimport { type EastingNorthingField } from '~/src/server/plugins/engine/components/EastingNorthingField.js'\nimport { isFormValue } from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { type LatLongField } from '~/src/server/plugins/engine/components/LatLongField.js'\nimport { markdown } from '~/src/server/plugins/engine/components/markdownParser.js'\nimport {\n  type DateInputItem,\n  type Label,\n  type ViewModel\n} from '~/src/server/plugins/engine/components/types.js'\nimport {\n  type FormPayload,\n  type FormSubmissionError,\n  type FormValue\n} from '~/src/server/plugins/engine/types.js'\n\nexport type LocationField =\n  | InstanceType<typeof EastingNorthingField>\n  | InstanceType<typeof LatLongField>\n\nexport function getLocationFieldViewModel(\n  component: LocationField,\n  viewModel: ViewModel & {\n    label: Label\n    id: string\n    name: string\n    value: FormValue\n  },\n  payload: FormPayload,\n  errors?: FormSubmissionError[]\n) {\n  const { collection, name } = component\n  const { fieldset: existingFieldset, label } = viewModel\n\n  // Check for component errors only\n  const hasError = errors?.some((error) => error.name === name)\n\n  // Use the component collection to generate the subitems\n  const items: DateInputItem[] = collection\n    .getViewModel(payload, errors)\n    .map(({ model }): DateInputItem => {\n      let { label, type, value, classes, prefix, suffix, errorMessage } = model\n\n      if (label) {\n        label.toString = () => label.text // Use string labels\n      }\n\n      if (hasError || errorMessage) {\n        classes = `${classes ?? ''} govuk-input--error`.trim()\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        label,\n        id: model.id,\n        name: model.name,\n        type,\n        value,\n        classes,\n        prefix,\n        suffix\n      }\n    })\n\n  const fieldset = existingFieldset ?? {\n    legend: {\n      text: label.text,\n      classes: 'govuk-fieldset__legend--m'\n    }\n  }\n\n  const result = {\n    ...viewModel,\n    fieldset,\n    items\n  }\n\n  if (component.options.instructionText) {\n    return {\n      ...result,\n      instructionText: markdown.parse(component.options.instructionText, {\n        async: false\n      })\n    }\n  }\n\n  return result\n}\n\n/**\n * Validator factory for location-based fields.\n * This creates a validator that ensures all required fields are present.\n */\nexport function createLocationFieldValidator(\n  component: LocationField\n): CustomValidator {\n  return (payload: FormPayload, helpers) => {\n    const { collection, name, options } = component\n\n    const values = component.getFormValueFromState(\n      component.getStateFromValidForm(payload)\n    )\n\n    const context: Context = {\n      missing: collection.keys,\n      key: name\n    }\n\n    if (!component.isState(values)) {\n      return options.required !== false\n        ? helpers.error('object.required', context)\n        : payload\n    }\n\n    return payload\n  }\n}\n"],"mappings":"AAGA,SAASA,WAAW;AAEpB,SAASC,QAAQ;AAgBjB,OAAO,SAASC,yBAAyBA,CACvCC,SAAwB,EACxBC,SAKC,EACDC,OAAoB,EACpBC,MAA8B,EAC9B;EACA,MAAM;IAAEC,UAAU;IAAEC;EAAK,CAAC,GAAGL,SAAS;EACtC,MAAM;IAAEM,QAAQ,EAAEC,gBAAgB;IAAEC;EAAM,CAAC,GAAGP,SAAS;;EAEvD;EACA,MAAMQ,QAAQ,GAAGN,MAAM,EAAEO,IAAI,CAAEC,KAAK,IAAKA,KAAK,CAACN,IAAI,KAAKA,IAAI,CAAC;;EAE7D;EACA,MAAMO,KAAsB,GAAGR,UAAU,CACtCS,YAAY,CAACX,OAAO,EAAEC,MAAM,CAAC,CAC7BW,GAAG,CAAC,CAAC;IAAEC;EAAM,CAAC,KAAoB;IACjC,IAAI;MAAEP,KAAK;MAAEQ,IAAI;MAAEC,KAAK;MAAEC,OAAO;MAAEC,MAAM;MAAEC,MAAM;MAAEC;IAAa,CAAC,GAAGN,KAAK;IAEzE,IAAIP,KAAK,EAAE;MACTA,KAAK,CAACc,QAAQ,GAAG,MAAMd,KAAK,CAACe,IAAI,EAAC;IACpC;IAEA,IAAId,QAAQ,IAAIY,YAAY,EAAE;MAC5BH,OAAO,GAAG,GAAGA,OAAO,IAAI,EAAE,qBAAqB,CAACM,IAAI,CAAC,CAAC;IACxD;;IAEA;IACA;IACA,IAAI,CAAC3B,WAAW,CAACoB,KAAK,CAAC,EAAE;MACvBA,KAAK,GAAGQ,SAAS;IACnB;IAEA,OAAO;MACLjB,KAAK;MACLkB,EAAE,EAAEX,KAAK,CAACW,EAAE;MACZrB,IAAI,EAAEU,KAAK,CAACV,IAAI;MAChBW,IAAI;MACJC,KAAK;MACLC,OAAO;MACPC,MAAM;MACNC;IACF,CAAC;EACH,CAAC,CAAC;EAEJ,MAAMd,QAAQ,GAAGC,gBAAgB,IAAI;IACnCoB,MAAM,EAAE;MACNJ,IAAI,EAAEf,KAAK,CAACe,IAAI;MAChBL,OAAO,EAAE;IACX;EACF,CAAC;EAED,MAAMU,MAAM,GAAG;IACb,GAAG3B,SAAS;IACZK,QAAQ;IACRM;EACF,CAAC;EAED,IAAIZ,SAAS,CAAC6B,OAAO,CAACC,eAAe,EAAE;IACrC,OAAO;MACL,GAAGF,MAAM;MACTE,eAAe,EAAEhC,QAAQ,CAACiC,KAAK,CAAC/B,SAAS,CAAC6B,OAAO,CAACC,eAAe,EAAE;QACjEE,KAAK,EAAE;MACT,CAAC;IACH,CAAC;EACH;EAEA,OAAOJ,MAAM;AACf;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASK,4BAA4BA,CAC1CjC,SAAwB,EACP;EACjB,OAAO,CAACE,OAAoB,EAAEgC,OAAO,KAAK;IACxC,MAAM;MAAE9B,UAAU;MAAEC,IAAI;MAAEwB;IAAQ,CAAC,GAAG7B,SAAS;IAE/C,MAAMmC,MAAM,GAAGnC,SAAS,CAACoC,qBAAqB,CAC5CpC,SAAS,CAACqC,qBAAqB,CAACnC,OAAO,CACzC,CAAC;IAED,MAAMoC,OAAgB,GAAG;MACvBC,OAAO,EAAEnC,UAAU,CAACoC,IAAI;MACxBC,GAAG,EAAEpC;IACP,CAAC;IAED,IAAI,CAACL,SAAS,CAAC0C,OAAO,CAACP,MAAM,CAAC,EAAE;MAC9B,OAAON,OAAO,CAACc,QAAQ,KAAK,KAAK,GAC7BT,OAAO,CAACvB,KAAK,CAAC,iBAAiB,EAAE2B,OAAO,CAAC,GACzCpC,OAAO;IACb;IAEA,OAAOA,OAAO;EAChB,CAAC;AACH","ignoreList":[]}

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

@@ -0,0 +1,19 @@
+import { type NationalGridFieldNumberFieldComponent } from '@defra/forms-model';
+import type joi from 'joi';
+import { LocationFieldBase } from '~/src/server/plugins/engine/components/LocationFieldBase.js';
+export declare class NationalGridFieldNumberField extends LocationFieldBase {
+    options: NationalGridFieldNumberFieldComponent['options'];
+    protected getValidationConfig(): {
+        pattern: RegExp;
+        patternErrorMessage: string;
+        customValidation: (value: string, helpers: joi.CustomHelpers) => string | joi.ErrorReport;
+    };
+    protected getErrorTemplates(): {
+        type: string;
+        template: string;
+    }[];
+    /**
+     * Static version of getAllPossibleErrors that doesn't require a component instance.
+     */
+    static getAllPossibleErrors(): import("../types.js").ErrorMessageTemplateList;
+}

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

@@ -0,0 +1,40 @@
+import { LocationFieldBase } from "./LocationFieldBase.js";
+export class NationalGridFieldNumberField extends LocationFieldBase {
+  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, helpers) => {
+        // 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)}`;
+        return formattedValue;
+      }
+    };
+  }
+  getErrorTemplates() {
+    return [{
+      type: 'pattern',
+      template: 'Enter a valid National Grid field number for [short description] like NG 1234 5678'
+    }];
+  }
+
+  /**
+   * Static version of getAllPossibleErrors that doesn't require a component instance.
+   */
+  static getAllPossibleErrors() {
+    const instance = Object.create(NationalGridFieldNumberField.prototype);
+    return instance.getAllPossibleErrors();
+  }
+}
+//# sourceMappingURL=NationalGridFieldNumberField.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"NationalGridFieldNumberField.js","names":["LocationFieldBase","NationalGridFieldNumberField","getValidationConfig","pattern","patternErrorMessage","title","customValidation","value","helpers","cleanValue","replace","test","error","letters","substring","numbers","formattedValue","getErrorTemplates","type","template","getAllPossibleErrors","instance","Object","create","prototype"],"sources":["../../../../../src/server/plugins/engine/components/NationalGridFieldNumberField.ts"],"sourcesContent":["import { type NationalGridFieldNumberFieldComponent } from '@defra/forms-model'\nimport type joi from 'joi'\n\nimport { LocationFieldBase } from '~/src/server/plugins/engine/components/LocationFieldBase.js'\n\nexport class NationalGridFieldNumberField extends LocationFieldBase {\n  declare options: NationalGridFieldNumberFieldComponent['options']\n\n  protected getValidationConfig() {\n    return {\n      // Pattern allows spaces and commas in the input since custom validation will clean them\n      pattern: /^[A-Z]{2}[\\d\\s,]*$/i,\n      patternErrorMessage: `Enter a valid National Grid field number for ${this.title} like NG 1234 5678`,\n      customValidation: (value: string, helpers: joi.CustomHelpers) => {\n        // Strip spaces and commas for validation\n        const cleanValue = value.replace(/[\\s,]/g, '')\n\n        // Check if it matches the exact pattern after cleaning\n        if (!/^[A-Z]{2}\\d{8}$/i.test(cleanValue)) {\n          return helpers.error('string.pattern.base')\n        }\n\n        // Format with spaces per GDS guidance: NG 1234 5678\n        const letters = cleanValue.substring(0, 2)\n        const numbers = cleanValue.substring(2)\n        const formattedValue = `${letters} ${numbers.substring(0, 4)} ${numbers.substring(4)}`\n\n        return formattedValue\n      }\n    }\n  }\n\n  protected getErrorTemplates() {\n    return [\n      {\n        type: 'pattern',\n        template:\n          'Enter a valid National Grid field number for [short description] like NG 1234 5678'\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(\n      NationalGridFieldNumberField.prototype\n    ) as NationalGridFieldNumberField\n    return instance.getAllPossibleErrors()\n  }\n}\n"],"mappings":"AAGA,SAASA,iBAAiB;AAE1B,OAAO,MAAMC,4BAA4B,SAASD,iBAAiB,CAAC;EAGxDE,mBAAmBA,CAAA,EAAG;IAC9B,OAAO;MACL;MACAC,OAAO,EAAE,qBAAqB;MAC9BC,mBAAmB,EAAE,gDAAgD,IAAI,CAACC,KAAK,oBAAoB;MACnGC,gBAAgB,EAAEA,CAACC,KAAa,EAAEC,OAA0B,KAAK;QAC/D;QACA,MAAMC,UAAU,GAAGF,KAAK,CAACG,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;;QAE9C;QACA,IAAI,CAAC,kBAAkB,CAACC,IAAI,CAACF,UAAU,CAAC,EAAE;UACxC,OAAOD,OAAO,CAACI,KAAK,CAAC,qBAAqB,CAAC;QAC7C;;QAEA;QACA,MAAMC,OAAO,GAAGJ,UAAU,CAACK,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1C,MAAMC,OAAO,GAAGN,UAAU,CAACK,SAAS,CAAC,CAAC,CAAC;QACvC,MAAME,cAAc,GAAG,GAAGH,OAAO,IAAIE,OAAO,CAACD,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,IAAIC,OAAO,CAACD,SAAS,CAAC,CAAC,CAAC,EAAE;QAEtF,OAAOE,cAAc;MACvB;IACF,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,CAC5BtB,4BAA4B,CAACuB,SAC/B,CAAiC;IACjC,OAAOH,QAAQ,CAACD,oBAAoB,CAAC,CAAC;EACxC;AACF","ignoreList":[]}

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

@@ -0,0 +1,19 @@
+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;
+        template: string;
+    }[];
+    /**
+     * Static version of getAllPossibleErrors that doesn't require a component instance.
+     */
+    static getAllPossibleErrors(): import("../types.js").ErrorMessageTemplateList;
+}

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

@@ -0,0 +1,56 @@
+import { LocationFieldBase } from "./LocationFieldBase.js";
+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]*$/;
+    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;
+      }
+    };
+  }
+  getErrorTemplates() {
+    return [{
+      type: 'pattern',
+      template: 'Enter a valid OS grid reference for [short description] like TQ123456'
+    }];
+  }
+
+  /**
+   * Static version of getAllPossibleErrors that doesn't require a component instance.
+   */
+  static getAllPossibleErrors() {
+    const instance = Object.create(OsGridRefField.prototype);
+    return instance.getAllPossibleErrors();
+  }
+}
+//# sourceMappingURL=OsGridRefField.js.map

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

@@ -0,0 +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":[]}

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

@@ -1,15 +1,14 @@
 import { ComponentType, type ComponentDef } from '@defra/forms-model';
-import { Marked } from 'marked';
 import { type ComponentBase } from '~/src/server/plugins/engine/components/ComponentBase.js';
 import { ListFormComponent } from '~/src/server/plugins/engine/components/ListFormComponent.js';
 import * as Components from '~/src/server/plugins/engine/components/index.js';
 import { type FormState } from '~/src/server/plugins/engine/types.js';
 export type Component = InstanceType<(typeof Components)[keyof typeof Components]>;
-export type Field = InstanceType<typeof Components.AutocompleteField | typeof Components.RadiosField | typeof Components.YesNoField | typeof Components.CheckboxesField | typeof Components.DatePartsField | typeof Components.EmailAddressField | typeof Components.MonthYearField | typeof Components.MultilineTextField | typeof Components.NumberField | typeof Components.SelectField | typeof Components.TelephoneNumberField | typeof Components.TextField | typeof Components.UkAddressField | typeof Components.FileUploadField>;
-export type Guidance = InstanceType<typeof Components.Details | typeof Components.Html | typeof Components.Markdown | typeof Components.InsetText | typeof Components.List>;
+export type Field = InstanceType<typeof Components.AutocompleteField | typeof Components.RadiosField | typeof Components.YesNoField | typeof Components.CheckboxesField | typeof Components.DatePartsField | typeof Components.DeclarationField | typeof Components.EastingNorthingField | typeof Components.EmailAddressField | typeof Components.LatLongField | typeof Components.MonthYearField | typeof Components.MultilineTextField | typeof Components.NationalGridFieldNumberField | typeof Components.NumberField | typeof Components.OsGridRefField | typeof Components.SelectField | typeof Components.TelephoneNumberField | typeof Components.TextField | typeof Components.UkAddressField | typeof Components.FileUploadField>;
+export type Guidance = InstanceType<typeof Components.Details> | InstanceType<typeof Components.Html> | InstanceType<typeof Components.Markdown> | InstanceType<typeof Components.InsetText> | InstanceType<typeof Components.List>;
 export type ListField = InstanceType<typeof Components.AutocompleteField | typeof Components.CheckboxesField | typeof Components.RadiosField | typeof Components.SelectField | typeof Components.YesNoField>;
 export declare const designerUrl: string;
-export declare const markdown: Marked;
+export { markdown } from '~/src/server/plugins/engine/components/markdownParser.js';
 /**
  * Filter known components with lists
  */

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

@@ -1,9 +1,9 @@
 import { ComponentType } from '@defra/forms-model';
-import { Marked } from 'marked';
 import { config } from "../../../../../config/index.js";
 import { ListFormComponent } from "../ListFormComponent.js";
 import { escapeMarkdown } from "./index.js";
 import * as Components from "../index.js";
+import { markdown } from "../markdownParser.js";
 
 // All component instances
 
@@ -14,38 +14,15 @@ import * as Components from "../index.js";
 // List component instances only
 
 export const designerUrl = config.get('designerUrl');
-export const markdown = new Marked({
-  breaks: true,
-  gfm: true,
-  /**
-   * Render paragraphs without `<p>` wrappers
-   * for check answers summary list `<dd>`
-   */
-  extensions: [{
-    name: 'paragraph',
-    renderer({
-      tokens = []
-    }) {
-      const text = this.parser.parseInline(tokens);
-      return tokens.length > 1 ? `${text}<br>` : text;
-    }
-  }],
-  /**
-   * Restrict allowed Markdown tokens
-   */
-  walkTokens(token) {
-    const tokens = ['br', 'escape', 'list', 'list_item', 'paragraph', 'space', 'text'];
-    if (!tokens.includes(token.type)) {
-      token.type = 'text';
-    }
-  }
-});
+
+// Re-export markdown from its own module to avoid circular dependencies
+export { markdown } from "../markdownParser.js";
 
 /**
  * Filter known components with lists
  */
 export function hasListFormField(field) {
-  return !!field && isListFieldType(field.type);
+  return !!field && field.type !== undefined && isListFieldType(field.type);
 }
 export function isListFieldType(type) {
   const allowedTypes = [ComponentType.AutocompleteField, ComponentType.CheckboxesField, ComponentType.RadiosField, ComponentType.SelectField, ComponentType.YesNoField];
@@ -67,6 +44,9 @@ export function createComponent(def, options) {
     case ComponentType.DatePartsField:
       component = new Components.DatePartsField(def, options);
       break;
+    case ComponentType.DeclarationField:
+      component = new Components.DeclarationField(def, options);
+      break;
     case ComponentType.Details:
       component = new Components.Details(def, options);
       break;
@@ -115,6 +95,18 @@ export function createComponent(def, options) {
     case ComponentType.FileUploadField:
       component = new Components.FileUploadField(def, options);
       break;
+    case ComponentType.EastingNorthingField:
+      component = new Components.EastingNorthingField(def, options);
+      break;
+    case ComponentType.OsGridRefField:
+      component = new Components.OsGridRefField(def, options);
+      break;
+    case ComponentType.NationalGridFieldNumberField:
+      component = new Components.NationalGridFieldNumberField(def, options);
+      break;
+    case ComponentType.LatLongField:
+      component = new Components.LatLongField(def, options);
+      break;
   }
   if (typeof component === 'undefined') {
     throw new Error(`Component type ${def.type} does not exist`);
@@ -142,7 +134,7 @@ export function getAnswer(field, state, options = {
   }
 
   // Use display HTML for check answers summary (multi line)
-  if (field instanceof ListFormComponent || field instanceof Components.MultilineTextField || field instanceof Components.UkAddressField) {
+  if (field instanceof ListFormComponent || field instanceof Components.MultilineTextField || field instanceof Components.UkAddressField || field instanceof Components.EastingNorthingField || field instanceof Components.LatLongField) {
     return markdown.parse(getAnswerMarkdown(field, state), {
       async: false
     }).trim();
@@ -214,6 +206,9 @@ export function getAnswerMarkdown(field, state, options = {
   } else if (field instanceof Components.UkAddressField) {
     // Format UK addresses into new lines
     answerEscaped = (field.getContextValueFromState(state) ?? []).map(escapeMarkdown).join('\n').concat('\n');
+  } else if (field instanceof Components.EastingNorthingField || field instanceof Components.LatLongField) {
+    const contextValue = field.getContextValueFromState(state);
+    answerEscaped = contextValue ? `${contextValue}\n` : '';
   }
   return answerEscaped;
 }