@defra/forms-engine-plugin 5.0.0-alpha.1 → 5.0.0-alpha.11

package/.server/server/plugins/postcode-lookup/views/postcode-lookup-details.html

@@ -33,7 +33,7 @@
             <!-- Postcode lookup select -->
             <!-- Postcode lookup details display -->
             {%- set detailsHtml -%}
-              <strong>{{ details.postcodeQuery }}</strong>{% if details.buildingNameQuery %} and <strong>{{ details.buildingNameQuery }}</strong>{% endif %}
+              <strong>{{ details.postcodeQuery }}</strong>{% if details.buildingNameQuery %} {{ t('common.and')}} <strong>{{ details.buildingNameQuery }}</strong>{% endif %}
             {%- endset -%}
 
             {% if hasAddresses %}
@@ -72,9 +72,9 @@
           {{ govukButton(buttons.continueButton) }}
 
           {% if buttons.manualLink %}
-            <p class="govuk-body">or <a class="govuk-link govuk-link--no-visited-state" href="{{ buttons.manualLink.href }}">{{buttons.manualLink.text}}</a></p>
+            <p class="govuk-body">{{ t('common.or')}} <a class="govuk-link govuk-link--no-visited-state" href="{{ buttons.manualLink.href }}">{{buttons.manualLink.text}}</a></p>
           {% elif buttons.detailsLink %}
-            <p class="govuk-body">or <a class="govuk-link govuk-link--no-visited-state" href="{{ buttons.detailsLink.href }}">{{buttons.detailsLink.text}}</a></p>
+            <p class="govuk-body">{{ t('common.or')}} <a class="govuk-link govuk-link--no-visited-state" href="{{ buttons.detailsLink.href }}">{{buttons.detailsLink.text}}</a></p>
           {% endif %}
         </div>
       </form>

package/.server/server/utils/type-utils.d.ts

@@ -1,3 +1,2 @@
-import { type JoiExpression, type LanguageMessages, type LanguageMessagesExt } from 'joi';
-export declare function convertToLanguageMessages(extLanguageMessages: LanguageMessagesExt): LanguageMessages;
+import { type JoiExpression } from 'joi';
 export declare function createJoiExpression(expr: string): JoiExpression;

package/.server/server/utils/type-utils.js

@@ -1,7 +1,4 @@
 import Joi from 'joi';
-export function convertToLanguageMessages(extLanguageMessages) {
-  return extLanguageMessages;
-}
 export function createJoiExpression(expr) {
   return Joi.expression(expr);
 }

package/.server/server/utils/type-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-utils.js","names":["Joi","convertToLanguageMessages","extLanguageMessages","createJoiExpression","expr","expression"],"sources":["../../../src/server/utils/type-utils.ts"],"sourcesContent":["import Joi, {\n  type JoiExpression,\n  type LanguageMessages,\n  type LanguageMessagesExt\n} from 'joi'\n\nexport function convertToLanguageMessages(\n  extLanguageMessages: LanguageMessagesExt\n): LanguageMessages {\n  return extLanguageMessages as unknown as LanguageMessages\n}\n\nexport function createJoiExpression(expr: string): JoiExpression {\n  return Joi.expression(expr) as unknown as JoiExpression\n}\n"],"mappings":"AAAA,OAAOA,GAAG,MAIH,KAAK;AAEZ,OAAO,SAASC,yBAAyBA,CACvCC,mBAAwC,EACtB;EAClB,OAAOA,mBAAmB;AAC5B;AAEA,OAAO,SAASC,mBAAmBA,CAACC,IAAY,EAAiB;EAC/D,OAAOJ,GAAG,CAACK,UAAU,CAACD,IAAI,CAAC;AAC7B","ignoreList":[]}
+{"version":3,"file":"type-utils.js","names":["Joi","createJoiExpression","expr","expression"],"sources":["../../../src/server/utils/type-utils.ts"],"sourcesContent":["import Joi, { type JoiExpression } from 'joi'\n\nexport function createJoiExpression(expr: string): JoiExpression {\n  return Joi.expression(expr) as unknown as JoiExpression\n}\n"],"mappings":"AAAA,OAAOA,GAAG,MAA8B,KAAK;AAE7C,OAAO,SAASC,mBAAmBA,CAACC,IAAY,EAAiB;EAC/D,OAAOF,GAAG,CAACG,UAAU,CAACD,IAAI,CAAC;AAC7B","ignoreList":[]}

package/.server/server/utils/utils.d.ts

@@ -15,4 +15,10 @@ export function isValidUUID(str: string): boolean;
  * @param {AnyFormRequest} request
  */
 export function resolveLanguage(request: AnyFormRequest): string;
+/**
+ * Create a comma-separated list with the last seperator being 'or'
+ * @param { string[] | undefined } items
+ * @param {string} [finalSeparator]
+ */
+export function joinWithOr(items: string[] | undefined, finalSeparator?: string): string;
 import type { AnyFormRequest } from '../../server/plugins/engine/types.js';

package/.server/server/utils/utils.js

@@ -43,7 +43,24 @@ export function resolveLanguage(request) {
 }
 
 /**
- * @import { FormMetadata } from '@defra/forms-model'
+ * Create a comma-separated list with the last seperator being 'or'
+ * @param { string[] | undefined } items
+ * @param {string} [finalSeparator]
+ */
+export function joinWithOr(items, finalSeparator = 'or') {
+  if (!items || items.length === 0) {
+    return '';
+  }
+  if (items.length === 1) {
+    return items[0];
+  }
+  if (items.length === 2) {
+    return `${items[0]} ${finalSeparator} ${items[1]}`;
+  }
+  return `${items.slice(0, -1).join(', ')} ${finalSeparator} ${items.at(-1)}`;
+}
+
+/**
  * @import { AnyFormRequest } from '../../server/plugins/engine/types.js'
  */
 //# sourceMappingURL=utils.js.map

package/.server/server/utils/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":["getTraceId","Joi","config","getPluginOptions","applyTraceHeaders","existingHeaders","header","get","traceId","headers","undefined","Object","assign","isValidUUID","str","error","string","uuid","validate","resolveLanguage","request","getLanguage","server","query","yar"],"sources":["../../../src/server/utils/utils.js"],"sourcesContent":["import { getTraceId } from '@defra/hapi-tracing'\nimport Joi from 'joi'\n\nimport { config } from '~/src/config/index.js'\nimport { getPluginOptions } from '~/src/server/plugins/engine/helpers.js'\n\n/**\n * Returns a set of headers to use in an HTTP request, merging them with any existing headers in options.\n * @param {Record<string, string> | undefined} [existingHeaders] - Optional existing headers to merge with the tracing headers.\n * @param {string} [header] - The tracing header name to use.\n * @returns {Record<string, string> | undefined} The merged headers, or undefined if no tracing header is available.\n */\nexport function applyTraceHeaders(\n  existingHeaders,\n  header = config.get('tracing').header\n) {\n  if (!header) {\n    return existingHeaders\n  }\n\n  const traceId = getTraceId()\n\n  const headers = traceId ? { [header]: traceId } : undefined\n\n  return existingHeaders ? Object.assign(existingHeaders, headers) : headers\n}\n\n/**\n * Validates if a string conforms to the uuid structure\n * @param {string} str\n * @returns\n */\nexport function isValidUUID(str) {\n  const { error } = Joi.string().uuid().validate(str)\n  return error === undefined\n}\n\n/**\n * @param {AnyFormRequest} request\n */\nexport function resolveLanguage(request) {\n  const { getLanguage } = getPluginOptions(request.server)\n  return getLanguage?.(request.query, request.yar) ?? 'en-GB'\n}\n\n/**\n * @import { FormMetadata } from '@defra/forms-model'\n * @import { AnyFormRequest } from '~/src/server/plugins/engine/types.js'\n */\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,qBAAqB;AAChD,OAAOC,GAAG,MAAM,KAAK;AAErB,SAASC,MAAM;AACf,SAASC,gBAAgB;;AAEzB;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAC/BC,eAAe,EACfC,MAAM,GAAGJ,MAAM,CAACK,GAAG,CAAC,SAAS,CAAC,CAACD,MAAM,EACrC;EACA,IAAI,CAACA,MAAM,EAAE;IACX,OAAOD,eAAe;EACxB;EAEA,MAAMG,OAAO,GAAGR,UAAU,CAAC,CAAC;EAE5B,MAAMS,OAAO,GAAGD,OAAO,GAAG;IAAE,CAACF,MAAM,GAAGE;EAAQ,CAAC,GAAGE,SAAS;EAE3D,OAAOL,eAAe,GAAGM,MAAM,CAACC,MAAM,CAACP,eAAe,EAAEI,OAAO,CAAC,GAAGA,OAAO;AAC5E;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,WAAWA,CAACC,GAAG,EAAE;EAC/B,MAAM;IAAEC;EAAM,CAAC,GAAGd,GAAG,CAACe,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,CAACC,QAAQ,CAACJ,GAAG,CAAC;EACnD,OAAOC,KAAK,KAAKL,SAAS;AAC5B;;AAEA;AACA;AACA;AACA,OAAO,SAASS,eAAeA,CAACC,OAAO,EAAE;EACvC,MAAM;IAAEC;EAAY,CAAC,GAAGlB,gBAAgB,CAACiB,OAAO,CAACE,MAAM,CAAC;EACxD,OAAOD,WAAW,GAAGD,OAAO,CAACG,KAAK,EAAEH,OAAO,CAACI,GAAG,CAAC,IAAI,OAAO;AAC7D;;AAEA;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"file":"utils.js","names":["getTraceId","Joi","config","getPluginOptions","applyTraceHeaders","existingHeaders","header","get","traceId","headers","undefined","Object","assign","isValidUUID","str","error","string","uuid","validate","resolveLanguage","request","getLanguage","server","query","yar","joinWithOr","items","finalSeparator","length","slice","join","at"],"sources":["../../../src/server/utils/utils.js"],"sourcesContent":["import { getTraceId } from '@defra/hapi-tracing'\nimport Joi from 'joi'\n\nimport { config } from '~/src/config/index.js'\nimport { getPluginOptions } from '~/src/server/plugins/engine/helpers.js'\n\n/**\n * Returns a set of headers to use in an HTTP request, merging them with any existing headers in options.\n * @param {Record<string, string> | undefined} [existingHeaders] - Optional existing headers to merge with the tracing headers.\n * @param {string} [header] - The tracing header name to use.\n * @returns {Record<string, string> | undefined} The merged headers, or undefined if no tracing header is available.\n */\nexport function applyTraceHeaders(\n  existingHeaders,\n  header = config.get('tracing').header\n) {\n  if (!header) {\n    return existingHeaders\n  }\n\n  const traceId = getTraceId()\n\n  const headers = traceId ? { [header]: traceId } : undefined\n\n  return existingHeaders ? Object.assign(existingHeaders, headers) : headers\n}\n\n/**\n * Validates if a string conforms to the uuid structure\n * @param {string} str\n * @returns\n */\nexport function isValidUUID(str) {\n  const { error } = Joi.string().uuid().validate(str)\n  return error === undefined\n}\n\n/**\n * @param {AnyFormRequest} request\n */\nexport function resolveLanguage(request) {\n  const { getLanguage } = getPluginOptions(request.server)\n  return getLanguage?.(request.query, request.yar) ?? 'en-GB'\n}\n\n/**\n * Create a comma-separated list with the last seperator being 'or'\n * @param { string[] | undefined } items\n * @param {string} [finalSeparator]\n */\nexport function joinWithOr(items, finalSeparator = 'or') {\n  if (!items || items.length === 0) {\n    return ''\n  }\n  if (items.length === 1) {\n    return items[0]\n  }\n  if (items.length === 2) {\n    return `${items[0]} ${finalSeparator} ${items[1]}`\n  }\n\n  return `${items.slice(0, -1).join(', ')} ${finalSeparator} ${items.at(-1)}`\n}\n\n/**\n * @import { AnyFormRequest } from '~/src/server/plugins/engine/types.js'\n */\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,qBAAqB;AAChD,OAAOC,GAAG,MAAM,KAAK;AAErB,SAASC,MAAM;AACf,SAASC,gBAAgB;;AAEzB;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAC/BC,eAAe,EACfC,MAAM,GAAGJ,MAAM,CAACK,GAAG,CAAC,SAAS,CAAC,CAACD,MAAM,EACrC;EACA,IAAI,CAACA,MAAM,EAAE;IACX,OAAOD,eAAe;EACxB;EAEA,MAAMG,OAAO,GAAGR,UAAU,CAAC,CAAC;EAE5B,MAAMS,OAAO,GAAGD,OAAO,GAAG;IAAE,CAACF,MAAM,GAAGE;EAAQ,CAAC,GAAGE,SAAS;EAE3D,OAAOL,eAAe,GAAGM,MAAM,CAACC,MAAM,CAACP,eAAe,EAAEI,OAAO,CAAC,GAAGA,OAAO;AAC5E;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,WAAWA,CAACC,GAAG,EAAE;EAC/B,MAAM;IAAEC;EAAM,CAAC,GAAGd,GAAG,CAACe,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,CAACC,QAAQ,CAACJ,GAAG,CAAC;EACnD,OAAOC,KAAK,KAAKL,SAAS;AAC5B;;AAEA;AACA;AACA;AACA,OAAO,SAASS,eAAeA,CAACC,OAAO,EAAE;EACvC,MAAM;IAAEC;EAAY,CAAC,GAAGlB,gBAAgB,CAACiB,OAAO,CAACE,MAAM,CAAC;EACxD,OAAOD,WAAW,GAAGD,OAAO,CAACG,KAAK,EAAEH,OAAO,CAACI,GAAG,CAAC,IAAI,OAAO;AAC7D;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CAACC,KAAK,EAAEC,cAAc,GAAG,IAAI,EAAE;EACvD,IAAI,CAACD,KAAK,IAAIA,KAAK,CAACE,MAAM,KAAK,CAAC,EAAE;IAChC,OAAO,EAAE;EACX;EACA,IAAIF,KAAK,CAACE,MAAM,KAAK,CAAC,EAAE;IACtB,OAAOF,KAAK,CAAC,CAAC,CAAC;EACjB;EACA,IAAIA,KAAK,CAACE,MAAM,KAAK,CAAC,EAAE;IACtB,OAAO,GAAGF,KAAK,CAAC,CAAC,CAAC,IAAIC,cAAc,IAAID,KAAK,CAAC,CAAC,CAAC,EAAE;EACpD;EAEA,OAAO,GAAGA,KAAK,CAACG,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC,IAAIH,cAAc,IAAID,KAAK,CAACK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;AAC7E;;AAEA;AACA;AACA","ignoreList":[]}

package/.server/server/utils/utils.test.js

@@ -1,6 +1,6 @@
 import { getTraceId } from '@defra/hapi-tracing';
 import { config } from "../../config/index.js";
-import { applyTraceHeaders, isValidUUID } from "./utils.js";
+import { applyTraceHeaders, isValidUUID, joinWithOr } from "./utils.js";
 jest.mock('@defra/hapi-tracing');
 describe('Header helper functions', () => {
   it('should include the trace id in the headers if available', () => {
@@ -81,5 +81,25 @@ describe('Header helper functions', () => {
   }) => {
     expect(isValidUUID(uuid)).toBe(valid);
   });
+  describe('joinWithOr', () => {
+    it('should handle undefined array', () => {
+      expect(joinWithOr(undefined)).toBe('');
+    });
+    it('should handle empty array', () => {
+      expect(joinWithOr([])).toBe('');
+    });
+    it('should handle one item', () => {
+      expect(joinWithOr(['item1'])).toBe('item1');
+    });
+    it('should handle two items', () => {
+      expect(joinWithOr(['item1', 'item2'])).toBe('item1 or item2');
+    });
+    it('should handle three items', () => {
+      expect(joinWithOr(['item1', 'item2', 'item3'])).toBe('item1, item2 or item3');
+    });
+    it('should handle a different last separator', () => {
+      expect(joinWithOr(['item1', 'item2', 'item3'], 'and')).toBe('item1, item2 and item3');
+    });
+  });
 });
 //# sourceMappingURL=utils.test.js.map

package/.server/server/utils/utils.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.test.js","names":["getTraceId","config","applyTraceHeaders","isValidUUID","jest","mock","describe","it","mocked","mockReturnValue","result","expect","toEqual","get","header","toBeUndefined","existingHeaders","Authorization","toBe","each","uuid","valid"],"sources":["../../../src/server/utils/utils.test.js"],"sourcesContent":["import { getTraceId } from '@defra/hapi-tracing'\n\nimport { config } from '~/src/config/index.js'\nimport { applyTraceHeaders, isValidUUID } from '~/src/server/utils/utils.js'\n\njest.mock('@defra/hapi-tracing')\n\ndescribe('Header helper functions', () => {\n  it('should include the trace id in the headers if available', () => {\n    jest.mocked(getTraceId).mockReturnValue('my-trace-id')\n\n    const result = applyTraceHeaders() // Updated to applyTraceHeaders\n    expect(result).toEqual({\n      [config.get('tracing').header]: 'my-trace-id'\n    })\n  })\n\n  it('should exclude the trace id in the headers if missing', () => {\n    jest.mocked(getTraceId).mockReturnValue(null)\n\n    const result = applyTraceHeaders() // Updated to applyTraceHeaders\n    expect(result).toBeUndefined()\n  })\n\n  it('should merge existing headers with the trace id if available', () => {\n    jest.mocked(getTraceId).mockReturnValue('my-trace-id')\n\n    const existingHeaders = { Authorization: 'Bearer token' }\n    const result = applyTraceHeaders(existingHeaders) // Updated to applyTraceHeaders\n\n    expect(result).toEqual({\n      Authorization: 'Bearer token',\n      [config.get('tracing').header]: 'my-trace-id'\n    })\n  })\n\n  it('should return existing headers without modification if trace id is missing', () => {\n    jest.mocked(getTraceId).mockReturnValue(null)\n\n    const existingHeaders = { Authorization: 'Bearer token' }\n    const result = applyTraceHeaders(existingHeaders) // Updated to applyTraceHeaders\n\n    expect(result).toEqual({\n      Authorization: 'Bearer token'\n    })\n  })\n\n  it('should return existing headers if tracing header configuration is missing', () => {\n    const existingHeaders = { Authorization: 'Bearer token' }\n    const result = applyTraceHeaders(existingHeaders, '')\n\n    expect(result).toBe(existingHeaders)\n  })\n\n  it.each([\n    { uuid: '1f457a37-7b99-452e-8324-df9e041abff2', valid: true },\n    { uuid: '0c9a2690-9a0c-4a2c-98d7-e9ef95615ac9', valid: true },\n    { uuid: 'f223de3b-5ae5-44b2-8cee-ea8439adc335', valid: true },\n    { uuid: '82ecc90c-bc47-4ec5-80af-1a9fc1c4c08c', valid: true },\n    { uuid: 'd99ff582-ecce-474f-a44b-bc5961d977c5', valid: true },\n    { uuid: '7afffc8a-81ab-4aa6-a8f5-ecf6a600a781', valid: true },\n    { uuid: '7afffc8a81ab4aa6a8f5ecf6a600a781', valid: true },\n    { uuid: '', valid: false },\n    { uuid: 'uuid', valid: false },\n    { uuid: 'h4f84ef8-b5e1-4544-94aa-1b671d50d8cb', valid: false }\n  ])('should validate uuid appropriately %s', ({ uuid, valid }) => {\n    expect(isValidUUID(uuid)).toBe(valid)\n  })\n})\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,qBAAqB;AAEhD,SAASC,MAAM;AACf,SAASC,iBAAiB,EAAEC,WAAW;AAEvCC,IAAI,CAACC,IAAI,CAAC,qBAAqB,CAAC;AAEhCC,QAAQ,CAAC,yBAAyB,EAAE,MAAM;EACxCC,EAAE,CAAC,yDAAyD,EAAE,MAAM;IAClEH,IAAI,CAACI,MAAM,CAACR,UAAU,CAAC,CAACS,eAAe,CAAC,aAAa,CAAC;IAEtD,MAAMC,MAAM,GAAGR,iBAAiB,CAAC,CAAC,EAAC;IACnCS,MAAM,CAACD,MAAM,CAAC,CAACE,OAAO,CAAC;MACrB,CAACX,MAAM,CAACY,GAAG,CAAC,SAAS,CAAC,CAACC,MAAM,GAAG;IAClC,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFP,EAAE,CAAC,uDAAuD,EAAE,MAAM;IAChEH,IAAI,CAACI,MAAM,CAACR,UAAU,CAAC,CAACS,eAAe,CAAC,IAAI,CAAC;IAE7C,MAAMC,MAAM,GAAGR,iBAAiB,CAAC,CAAC,EAAC;IACnCS,MAAM,CAACD,MAAM,CAAC,CAACK,aAAa,CAAC,CAAC;EAChC,CAAC,CAAC;EAEFR,EAAE,CAAC,8DAA8D,EAAE,MAAM;IACvEH,IAAI,CAACI,MAAM,CAACR,UAAU,CAAC,CAACS,eAAe,CAAC,aAAa,CAAC;IAEtD,MAAMO,eAAe,GAAG;MAAEC,aAAa,EAAE;IAAe,CAAC;IACzD,MAAMP,MAAM,GAAGR,iBAAiB,CAACc,eAAe,CAAC,EAAC;;IAElDL,MAAM,CAACD,MAAM,CAAC,CAACE,OAAO,CAAC;MACrBK,aAAa,EAAE,cAAc;MAC7B,CAAChB,MAAM,CAACY,GAAG,CAAC,SAAS,CAAC,CAACC,MAAM,GAAG;IAClC,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFP,EAAE,CAAC,4EAA4E,EAAE,MAAM;IACrFH,IAAI,CAACI,MAAM,CAACR,UAAU,CAAC,CAACS,eAAe,CAAC,IAAI,CAAC;IAE7C,MAAMO,eAAe,GAAG;MAAEC,aAAa,EAAE;IAAe,CAAC;IACzD,MAAMP,MAAM,GAAGR,iBAAiB,CAACc,eAAe,CAAC,EAAC;;IAElDL,MAAM,CAACD,MAAM,CAAC,CAACE,OAAO,CAAC;MACrBK,aAAa,EAAE;IACjB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFV,EAAE,CAAC,2EAA2E,EAAE,MAAM;IACpF,MAAMS,eAAe,GAAG;MAAEC,aAAa,EAAE;IAAe,CAAC;IACzD,MAAMP,MAAM,GAAGR,iBAAiB,CAACc,eAAe,EAAE,EAAE,CAAC;IAErDL,MAAM,CAACD,MAAM,CAAC,CAACQ,IAAI,CAACF,eAAe,CAAC;EACtC,CAAC,CAAC;EAEFT,EAAE,CAACY,IAAI,CAAC,CACN;IAAEC,IAAI,EAAE,sCAAsC;IAAEC,KAAK,EAAE;EAAK,CAAC,EAC7D;IAAED,IAAI,EAAE,sCAAsC;IAAEC,KAAK,EAAE;EAAK,CAAC,EAC7D;IAAED,IAAI,EAAE,sCAAsC;IAAEC,KAAK,EAAE;EAAK,CAAC,EAC7D;IAAED,IAAI,EAAE,sCAAsC;IAAEC,KAAK,EAAE;EAAK,CAAC,EAC7D;IAAED,IAAI,EAAE,sCAAsC;IAAEC,KAAK,EAAE;EAAK,CAAC,EAC7D;IAAED,IAAI,EAAE,sCAAsC;IAAEC,KAAK,EAAE;EAAK,CAAC,EAC7D;IAAED,IAAI,EAAE,kCAAkC;IAAEC,KAAK,EAAE;EAAK,CAAC,EACzD;IAAED,IAAI,EAAE,EAAE;IAAEC,KAAK,EAAE;EAAM,CAAC,EAC1B;IAAED,IAAI,EAAE,MAAM;IAAEC,KAAK,EAAE;EAAM,CAAC,EAC9B;IAAED,IAAI,EAAE,sCAAsC;IAAEC,KAAK,EAAE;EAAM,CAAC,CAC/D,CAAC,CAAC,uCAAuC,EAAE,CAAC;IAAED,IAAI;IAAEC;EAAM,CAAC,KAAK;IAC/DV,MAAM,CAACR,WAAW,CAACiB,IAAI,CAAC,CAAC,CAACF,IAAI,CAACG,KAAK,CAAC;EACvC,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"utils.test.js","names":["getTraceId","config","applyTraceHeaders","isValidUUID","joinWithOr","jest","mock","describe","it","mocked","mockReturnValue","result","expect","toEqual","get","header","toBeUndefined","existingHeaders","Authorization","toBe","each","uuid","valid","undefined"],"sources":["../../../src/server/utils/utils.test.js"],"sourcesContent":["import { getTraceId } from '@defra/hapi-tracing'\n\nimport { config } from '~/src/config/index.js'\nimport {\n  applyTraceHeaders,\n  isValidUUID,\n  joinWithOr\n} from '~/src/server/utils/utils.js'\n\njest.mock('@defra/hapi-tracing')\n\ndescribe('Header helper functions', () => {\n  it('should include the trace id in the headers if available', () => {\n    jest.mocked(getTraceId).mockReturnValue('my-trace-id')\n\n    const result = applyTraceHeaders() // Updated to applyTraceHeaders\n    expect(result).toEqual({\n      [config.get('tracing').header]: 'my-trace-id'\n    })\n  })\n\n  it('should exclude the trace id in the headers if missing', () => {\n    jest.mocked(getTraceId).mockReturnValue(null)\n\n    const result = applyTraceHeaders() // Updated to applyTraceHeaders\n    expect(result).toBeUndefined()\n  })\n\n  it('should merge existing headers with the trace id if available', () => {\n    jest.mocked(getTraceId).mockReturnValue('my-trace-id')\n\n    const existingHeaders = { Authorization: 'Bearer token' }\n    const result = applyTraceHeaders(existingHeaders) // Updated to applyTraceHeaders\n\n    expect(result).toEqual({\n      Authorization: 'Bearer token',\n      [config.get('tracing').header]: 'my-trace-id'\n    })\n  })\n\n  it('should return existing headers without modification if trace id is missing', () => {\n    jest.mocked(getTraceId).mockReturnValue(null)\n\n    const existingHeaders = { Authorization: 'Bearer token' }\n    const result = applyTraceHeaders(existingHeaders) // Updated to applyTraceHeaders\n\n    expect(result).toEqual({\n      Authorization: 'Bearer token'\n    })\n  })\n\n  it('should return existing headers if tracing header configuration is missing', () => {\n    const existingHeaders = { Authorization: 'Bearer token' }\n    const result = applyTraceHeaders(existingHeaders, '')\n\n    expect(result).toBe(existingHeaders)\n  })\n\n  it.each([\n    { uuid: '1f457a37-7b99-452e-8324-df9e041abff2', valid: true },\n    { uuid: '0c9a2690-9a0c-4a2c-98d7-e9ef95615ac9', valid: true },\n    { uuid: 'f223de3b-5ae5-44b2-8cee-ea8439adc335', valid: true },\n    { uuid: '82ecc90c-bc47-4ec5-80af-1a9fc1c4c08c', valid: true },\n    { uuid: 'd99ff582-ecce-474f-a44b-bc5961d977c5', valid: true },\n    { uuid: '7afffc8a-81ab-4aa6-a8f5-ecf6a600a781', valid: true },\n    { uuid: '7afffc8a81ab4aa6a8f5ecf6a600a781', valid: true },\n    { uuid: '', valid: false },\n    { uuid: 'uuid', valid: false },\n    { uuid: 'h4f84ef8-b5e1-4544-94aa-1b671d50d8cb', valid: false }\n  ])('should validate uuid appropriately %s', ({ uuid, valid }) => {\n    expect(isValidUUID(uuid)).toBe(valid)\n  })\n\n  describe('joinWithOr', () => {\n    it('should handle undefined array', () => {\n      expect(joinWithOr(undefined)).toBe('')\n    })\n    it('should handle empty array', () => {\n      expect(joinWithOr([])).toBe('')\n    })\n    it('should handle one item', () => {\n      expect(joinWithOr(['item1'])).toBe('item1')\n    })\n    it('should handle two items', () => {\n      expect(joinWithOr(['item1', 'item2'])).toBe('item1 or item2')\n    })\n    it('should handle three items', () => {\n      expect(joinWithOr(['item1', 'item2', 'item3'])).toBe(\n        'item1, item2 or item3'\n      )\n    })\n    it('should handle a different last separator', () => {\n      expect(joinWithOr(['item1', 'item2', 'item3'], 'and')).toBe(\n        'item1, item2 and item3'\n      )\n    })\n  })\n})\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-alpha.11",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -19,6 +19,11 @@
       "import": "./.server/server/plugins/engine/types/index.js",
       "default": "./.server/server/plugins/engine/types/index.js"
     },
+    "./maps": {
+      "sass": "./.server/client/stylesheets/maps.scss",
+      "import": "./.server/client/javascripts/maps.js",
+      "default": "./.server/client/javascripts/maps.js"
+    },
     "./shared.js": "./.server/client/javascripts/shared.js",
     "./shared.min.js": "./.public/javascripts/shared.min.js",
     "./shared.min.js.map": "./.public/javascripts/shared.min.js.map",
@@ -87,7 +92,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@defra/forms-model": "^3.0.687",
+    "@defra/forms-model": "^3.0.693",
     "@defra/hapi-tracing": "^1.29.0",
     "@defra/interactive-map": "^0.0.33-alpha",
     "@elastic/ecs-pino-format": "^1.5.0",
@@ -107,6 +112,7 @@
     "@turf/bbox": "^7.3.4",
     "@turf/boolean-within": "^7.3.5",
     "@turf/centroid": "^7.3.4",
+    "@turf/helpers": "^7.3.5",
     "@types/humanize-duration": "^3.27.4",
     "accessible-autocomplete": "^3.0.1",
     "atob": "^2.1.2",
@@ -131,6 +137,7 @@
     "joi": "^17.13.3",
     "liquidjs": "^10.24.0",
     "lodash": "^4.17.21",
+    "lru-cache": "^11.5.1",
     "maplibre-gl": "^5.24.0",
     "marked": "^15.0.12",
     "nunjucks": "^3.2.4",

package/src/client/javascripts/file-upload.js

@@ -305,17 +305,19 @@ function pollUploadStatus(uploadId) {
  * @param {HTMLButtonElement} uploadButton - The upload button
  * @param {HTMLButtonElement} continueButton - The continue button
  * @param {File[]} selectedFiles - The selected files
+ * @param {string} uploadingLabel - The text to display while uploading (can be multiple languages)
  */
 function handleStandardFormSubmission(
   formElement,
   fileInput,
   uploadButton,
   continueButton,
-  selectedFiles
+  selectedFiles,
+  uploadingLabel
 ) {
   // Render in reverse so first file ends up at the top of the summary list
   for (let i = selectedFiles.length - 1; i >= 0; i--) {
-    renderSummary(selectedFiles[i], 'Uploading…', formElement)
+    renderSummary(selectedFiles[i], uploadingLabel, formElement)
   }
 
   fileInput.focus()
@@ -405,6 +407,10 @@ function initUpload() {
     return
   }
 
+  const uploadingLabel =
+    document.getElementById('uploadedFilesContainer')?.dataset.uploadinglabel ??
+    'Uploading…'
+
   const formElement = /** @type {HTMLFormElement} */ (form)
   /** @type {File[]} */
   let selectedFiles = []
@@ -418,6 +424,7 @@ function initUpload() {
 
     if (fileInput.files && fileInput.files.length > 0) {
       selectedFiles = Array.from(fileInput.files)
+      uploadButton.click()
     }
   })
 
@@ -445,7 +452,8 @@ function initUpload() {
       fileInput,
       uploadButton,
       continueButton,
-      selectedFiles
+      selectedFiles,
+      uploadingLabel
     )
 
     handleAjaxFormSubmission(

package/src/client/javascripts/geospatial-map.js

@@ -10,6 +10,7 @@ import {
   defaultConfig,
   getCentroidGridRef,
   getCoordinateGridRef,
+  getMapCountryLayers,
   getMapLayers
 } from './map.js'
 import sssiDataset from './sssi-dataset.js'
@@ -174,43 +175,15 @@ export function processGeospatial(config, geospatial, index) {
   const plugins = [drawPlugin]
   const country = geospatial.dataset.country
   const mapLayers = getMapLayers(geospatial.dataset.maplayers)
+  const datasets = getMapCountryLayers(config.apiPath, country)
 
-  if (country) {
-    // Add the country bounds as a dataset plugin to show the valid area on the map
-    // and provide feedback to the user when they add features outside of the bounds.
-    const countriesDatasetPlugin = createDatasetsPlugin({
-      datasets: [
-        {
-          id: 'invalid-area',
-          label: 'Invalid areas',
-          geojson: `${config.apiPath}/maps/countries.geojson?omit=${country}`,
-          showInKey: false,
-          showInMenu: false,
-          style: {
-            stroke: 'gray',
-            strokeWidth: 1,
-            fill: 'rgba(211,211,211,0.8)'
-          }
-        },
-        {
-          id: 'valid-area',
-          label: 'Valid areas',
-          geojson: `${config.apiPath}/maps/countries.geojson?only=${country}`,
-          showInKey: false,
-          showInMenu: false,
-          style: {
-            stroke: 'rgba(0,112,60,1)',
-            strokeWidth: 1
-          }
-        }
-      ]
-    })
-
-    plugins.push(countriesDatasetPlugin)
+  if (mapLayers.includes('sssi')) {
+    datasets.push(...sssiDataset)
   }
 
-  if (mapLayers.includes('sssi')) {
-    plugins.push(createDatasetsPlugin(sssiDataset))
+  // Create a map dataset plugin if there are any present
+  if (datasets.length) {
+    plugins.push(createDatasetsPlugin({ datasets }))
   }
 
   const initConfig = {

package/src/client/javascripts/govuk.js

@@ -3,6 +3,7 @@ import {
   CharacterCount,
   Checkboxes,
   ErrorSummary,
+  FileUpload,
   Header,
   NotificationBanner,
   Radios,
@@ -16,6 +17,7 @@ export function initAllGovuk() {
   createAll(Checkboxes)
   createAll(ErrorSummary)
   createAll(Header)
+  createAll(FileUpload)
   createAll(NotificationBanner)
   createAll(Radios)
   createAll(SkipLink)

package/src/client/javascripts/location-map.js

@@ -7,6 +7,7 @@ import {
   createMap,
   defaultConfig,
   eastingNorthingToLatLong,
+  getMapCountryLayers,
   getMapLayers,
   latLongToEastingNorthing,
   latLongToOsGridRef,
@@ -423,10 +424,17 @@ export function processLocation(config, location, index) {
 
   locationInputs.after(mapContainer)
 
+  const country = location.dataset.country
   const mapLayers = getMapLayers(location.dataset.maplayers)
+  const datasets = getMapCountryLayers(config.apiPath, country)
 
   if (mapLayers.includes('sssi')) {
-    initConfig.plugins = [createDatasetsPlugin(sssiDataset)]
+    datasets.push(...sssiDataset)
+  }
+
+  // Create a map dataset plugin if there are any present
+  if (datasets.length) {
+    initConfig.plugins = [createDatasetsPlugin({ datasets })]
   }
 
   const { map, interactPlugin } = createMap(mapId, initConfig, config)

package/src/client/javascripts/map.js

@@ -367,6 +367,48 @@ export function getMapLayers(layers) {
   return trimmed ? trimmed.split(',') : []
 }
 
+/**
+ * Adds the country layers to a datasets array
+ * @param {string} apiPath
+ * @param {string} [country]
+ */
+export function getMapCountryLayers(apiPath, country) {
+  /** @type {any[]} */
+  const datasets = []
+
+  if (country) {
+    // Add the country bounds to the datasets array to show the valid area on the map
+    // and provide feedback to the user when they add features outside of the bounds.
+    datasets.push(
+      {
+        id: 'invalid-area',
+        label: 'Invalid areas',
+        geojson: `${apiPath}/maps/countries.geojson?omit=${country}`,
+        showInKey: false,
+        showInMenu: false,
+        style: {
+          stroke: 'gray',
+          strokeWidth: 1,
+          fill: 'rgba(211,211,211,0.8)'
+        }
+      },
+      {
+        id: 'valid-area',
+        label: 'Valid areas',
+        geojson: `${apiPath}/maps/countries.geojson?only=${country}`,
+        showInKey: false,
+        showInMenu: false,
+        style: {
+          stroke: 'rgba(0,112,60,1)',
+          strokeWidth: 1
+        }
+      }
+    )
+  }
+
+  return datasets
+}
+
 /**
  * @typedef {object} InteractiveMap - an instance of a InteractiveMap
  * @property {Function} on - register callback listeners to map events

package/src/client/javascripts/maps.js

@@ -0,0 +1,5 @@
+export { initMaps } from './map.js'
+export * as map from './map.js'
+export * as locationMap from './location-map.js'
+export * as geospatialMap from './geospatial-map.js'
+export * as sssiDataset from './sssi-dataset.js'

package/src/client/javascripts/shared.js

@@ -3,9 +3,7 @@ import { initDebounceClick as initDebounceClickImp } from './debounce-click.js'
 import { initFileUpload as initFileUploadImp } from './file-upload.js'
 import { initAllGovuk as initAllGovukImp } from './govuk.js'
 import { initPreviewCloseLink as initPreviewCloseLinkImp } from './preview-close-link.js'
-export { initMaps } from './map.js'
-export * as map from './map.js'
-export * as geospatialMap from './geospatial-map.js'
+export * from './maps.js'
 
 export const initAllGovuk = initAllGovukImp
 export const initAllAutocomplete = initAllAutocompleteImp

package/src/client/javascripts/sssi-dataset.js

@@ -49,49 +49,47 @@ export function sssiScotlandRequestTransformer(url, { bbox }) {
   }
 }
 
-export default {
-  datasets: [
-    {
-      id: 'sssi-england',
-      label: 'Sites of Special Scientific Interest',
-      dynamicGeoJSON: {
-        url: englandWFS,
-        idProperty: 'ref_code',
-        transformRequest: sssiEnglandRequestTransformer
-      },
-      minZoom,
-      style,
-      showInKey: true,
-      showInMenu: false
+export default [
+  {
+    id: 'sssi-england',
+    label: 'Sites of Special Scientific Interest',
+    dynamicGeoJSON: {
+      url: englandWFS,
+      idProperty: 'ref_code',
+      transformRequest: sssiEnglandRequestTransformer
     },
-    {
-      id: 'sssi-wales',
-      label: 'SSSI Wales',
-      dynamicGeoJSON: {
-        url: walesWFS,
-        idProperty: 'id',
-        transformRequest: sssiWalesRequestTransformer
-      },
-      minZoom,
-      style,
-      showInKey: false,
-      showInMenu: false
+    minZoom,
+    style,
+    showInKey: true,
+    showInMenu: false
+  },
+  {
+    id: 'sssi-wales',
+    label: 'SSSI Wales',
+    dynamicGeoJSON: {
+      url: walesWFS,
+      idProperty: 'id',
+      transformRequest: sssiWalesRequestTransformer
     },
-    {
-      id: 'sssi-scotland',
-      label: 'SSSI Scotland',
-      dynamicGeoJSON: {
-        url: scotlandWFS,
-        idProperty: 'OBJECTID',
-        transformRequest: sssiScotlandRequestTransformer
-      },
-      minZoom,
-      style,
-      showInKey: false,
-      showInMenu: false
-    }
-  ]
-}
+    minZoom,
+    style,
+    showInKey: false,
+    showInMenu: false
+  },
+  {
+    id: 'sssi-scotland',
+    label: 'SSSI Scotland',
+    dynamicGeoJSON: {
+      url: scotlandWFS,
+      idProperty: 'OBJECTID',
+      transformRequest: sssiScotlandRequestTransformer
+    },
+    minZoom,
+    style,
+    showInKey: false,
+    showInMenu: false
+  }
+]
 
 /**
  * @typedef {object} TransformRequestOptions

package/src/client/stylesheets/maps.scss

@@ -0,0 +1,4 @@
+@use "@defra/interactive-map/css" as core;
+@use "@defra/interactive-map/plugins/map-styles/css" as mapStyles;
+@use "@defra/interactive-map/plugins/search/css" as search;
+@use "@defra/interactive-map/plugins/scale-bar/css" as scaleBar;

package/src/client/stylesheets/shared.scss

@@ -3,11 +3,7 @@
 @use "prose";
 @use "summary-list";
 @use "location-fields";
-
-@use "@defra/interactive-map/css" as core;
-@use "@defra/interactive-map/plugins/map-styles/css" as mapStyles;
-@use "@defra/interactive-map/plugins/search/css" as search;
-@use "@defra/interactive-map/plugins/scale-bar/css" as scaleBar;
+@use "maps";
 
 // Use default GDS Transport font for autocomplete
 .autocomplete__hint,

package/src/server/constants.js

@@ -5,3 +5,5 @@ export const EXTERNAL_STATE_PAYLOAD = 'EXTERNAL_STATE_PAYLOAD'
 export const EXTERNAL_STATE_APPENDAGE = 'EXTERNAL_STATE_APPENDAGE'
 export const COMPONENT_STATE_ERROR = 'COMPONENT_STATE_ERROR'
 export const PAYMENT_EXPIRED_NOTIFICATION = 'PAYMENT_EXPIRED_NOTIFICATION'
+export const EN_GB = 'en-GB' // English language
+export const CY = 'cy' // Welsh language

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

@@ -1,8 +1,11 @@
 import { type AutocompleteFieldComponent } from '@defra/forms-model'
+import { type LanguageMessages } from 'joi'
 
 import { SelectField } from './SelectField.js'
 import { type RenderContext } from './types.js'
+import { buildValidationMessages } from '../i18n/buildValidationMessages.js'
 import { messageTemplate } from '../pageControllers/validationOptions.js'
+import { type Translator } from '../types/index.js'
 
 export class AutocompleteField extends SelectField {
   declare options: AutocompleteFieldComponent['options']
@@ -45,4 +48,14 @@ export class AutocompleteField extends SelectField {
       formGroup
     }
   }
+
+  getValidationMessagesOverride(translator: Translator) {
+    const { t } = translator
+    return {
+      [this.name]: {
+        'any.required': buildValidationMessages(t).objectRequired,
+        'any.only': buildValidationMessages(t).objectRequired
+      } as LanguageMessages
+    }
+  }
 }

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

@@ -1,8 +1,9 @@
 import { type CheckboxesFieldComponent, type Item } from '@defra/forms-model'
-import joi, { type ArraySchema } from 'joi'
+import joi, { type ArraySchema, type LanguageMessages } from 'joi'
 
 import { isFormValue } from './FormComponent.js'
 import { SelectionControlField } from './SelectionControlField.js'
+import { buildValidationMessages } from '../i18n/buildValidationMessages.js'
 import { type Translator } from '../i18n/types.js'
 import { type FormModel } from '../models/FormModel.js'
 import { type QuestionPageController } from '../pageControllers/QuestionPageController.js'
@@ -133,6 +134,17 @@ export class CheckboxesField extends SelectionControlField {
     return this.getContextValueFromFormValue(values)
   }
 
+  getValidationMessagesOverride(translator: Translator) {
+    const { t } = translator
+    return {
+      [this.name]: {
+        'array.min': buildValidationMessages(t).arrayMin,
+        'array.max': buildValidationMessages(t).arrayMax,
+        'array.length': buildValidationMessages(t).arrayLength
+      } as LanguageMessages
+    }
+  }
+
   /**
    * For error preview page that shows all possible errors on a component
    */

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

@@ -28,6 +28,7 @@ export class ComponentBase {
 
   isFormComponent = false
   model: FormModel
+  def: ComponentDef
 
   /** joi schemas based on a component defined in the form JSON. This validates a user's answer and is generated from {@link ComponentDef} */
   formSchema: ComponentSchema = joi.string()
@@ -45,6 +46,7 @@ export class ComponentBase {
     this.type = def.type
     this.name = def.name
     this.title = def.title
+    this.def = def
 
     if ('schema' in def) {
       this.schema = def.schema