@defra/forms-engine-plugin 5.0.0-alpha.2 → 5.0.0-alpha.20

package/.server/server/constants.d.ts

@@ -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";
+export const CY: "cy";

package/.server/server/constants.js

@@ -5,4 +5,6 @@ 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
 //# sourceMappingURL=constants.js.map

package/.server/server/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","names":["FORM_VERSION_METADATA_KEY","PREVIEW_PATH_PREFIX","FORM_PREFIX","EXTERNAL_STATE_PAYLOAD","EXTERNAL_STATE_APPENDAGE","COMPONENT_STATE_ERROR","PAYMENT_EXPIRED_NOTIFICATION"],"sources":["../../src/server/constants.js"],"sourcesContent":["export const FORM_VERSION_METADATA_KEY = '$$__formVersion'\nexport const PREVIEW_PATH_PREFIX = '/preview'\nexport const FORM_PREFIX = ''\nexport const EXTERNAL_STATE_PAYLOAD = 'EXTERNAL_STATE_PAYLOAD'\nexport const EXTERNAL_STATE_APPENDAGE = 'EXTERNAL_STATE_APPENDAGE'\nexport const COMPONENT_STATE_ERROR = 'COMPONENT_STATE_ERROR'\nexport const PAYMENT_EXPIRED_NOTIFICATION = 'PAYMENT_EXPIRED_NOTIFICATION'\n"],"mappings":"AAAA,OAAO,MAAMA,yBAAyB,GAAG,iBAAiB;AAC1D,OAAO,MAAMC,mBAAmB,GAAG,UAAU;AAC7C,OAAO,MAAMC,WAAW,GAAG,EAAE;AAC7B,OAAO,MAAMC,sBAAsB,GAAG,wBAAwB;AAC9D,OAAO,MAAMC,wBAAwB,GAAG,0BAA0B;AAClE,OAAO,MAAMC,qBAAqB,GAAG,uBAAuB;AAC5D,OAAO,MAAMC,4BAA4B,GAAG,8BAA8B","ignoreList":[]}
+{"version":3,"file":"constants.js","names":["FORM_VERSION_METADATA_KEY","PREVIEW_PATH_PREFIX","FORM_PREFIX","EXTERNAL_STATE_PAYLOAD","EXTERNAL_STATE_APPENDAGE","COMPONENT_STATE_ERROR","PAYMENT_EXPIRED_NOTIFICATION","EN_GB","CY"],"sources":["../../src/server/constants.js"],"sourcesContent":["export const FORM_VERSION_METADATA_KEY = '$$__formVersion'\nexport const PREVIEW_PATH_PREFIX = '/preview'\nexport const FORM_PREFIX = ''\nexport const EXTERNAL_STATE_PAYLOAD = 'EXTERNAL_STATE_PAYLOAD'\nexport const EXTERNAL_STATE_APPENDAGE = 'EXTERNAL_STATE_APPENDAGE'\nexport const COMPONENT_STATE_ERROR = 'COMPONENT_STATE_ERROR'\nexport const PAYMENT_EXPIRED_NOTIFICATION = 'PAYMENT_EXPIRED_NOTIFICATION'\nexport const EN_GB = 'en-GB' // English language\nexport const CY = 'cy' // Welsh language\n"],"mappings":"AAAA,OAAO,MAAMA,yBAAyB,GAAG,iBAAiB;AAC1D,OAAO,MAAMC,mBAAmB,GAAG,UAAU;AAC7C,OAAO,MAAMC,WAAW,GAAG,EAAE;AAC7B,OAAO,MAAMC,sBAAsB,GAAG,wBAAwB;AAC9D,OAAO,MAAMC,wBAAwB,GAAG,0BAA0B;AAClE,OAAO,MAAMC,qBAAqB,GAAG,uBAAuB;AAC5D,OAAO,MAAMC,4BAA4B,GAAG,8BAA8B;AAC1E,OAAO,MAAMC,KAAK,GAAG,OAAO,EAAC;AAC7B,OAAO,MAAMC,EAAE,GAAG,IAAI,EAAC","ignoreList":[]}

package/.server/server/plugins/engine/__stubs__/definitions.d.ts

@@ -0,0 +1,29 @@
+import { type FormDefinition } from '@defra/forms-model';
+/**
+ * A minimal, schema-valid V2 definition: one YesNo question page and a
+ * summary page. Each call returns a fresh object, so tests can mutate their
+ * copy freely without affecting each other.
+ */
+export declare function buildDefinition(): FormDefinition;
+/**
+ * A definition that passes schema validation but cannot be used by the
+ * engine: a ListItemRef condition points at the YesNoField (boolean), so the
+ * condition expression builder produces an unparseable expression. Distilled
+ * from a real production incident.
+ */
+export declare function buildBrokenConditionDefinition(): FormDefinition;
+/**
+ * A schema-valid definition whose first page names a controller that is
+ * neither built in nor registered by the host application.
+ */
+export declare function buildUnknownControllerDefinition(): FormDefinition;
+/**
+ * Schema-valid (component types are free strings in the schema), but the
+ * question uses a type the engine has no component class for.
+ */
+export declare function buildUnknownComponentDefinition(): FormDefinition;
+/**
+ * A definition that fails schema validation: the question page appears
+ * twice, violating the pages uniqueness rule.
+ */
+export declare function buildSchemaInvalidDefinition(): FormDefinition;

package/.server/server/plugins/engine/__stubs__/definitions.js

@@ -0,0 +1,125 @@
+import { ComponentType, ConditionType, ControllerType, Engine, OperatorName, SchemaVersion } from '@defra/forms-model';
+const YES_NO_COMPONENT_ID = 'a7c0242f-2a31-45b2-8c71-ff2ac7f53288';
+const USER_TYPE_LIST_ID = '4fa26e9c-07cf-47cd-a9dd-5cec0dd3f544';
+const EXISTING_USER_ITEM_ID = '55fe0067-d011-4d33-886c-e1aa266637c3';
+
+/**
+ * A minimal, schema-valid V2 definition: one YesNo question page and a
+ * summary page. Each call returns a fresh object, so tests can mutate their
+ * copy freely without affecting each other.
+ */
+export function buildDefinition() {
+  return {
+    name: 'Stub definition',
+    engine: Engine.V2,
+    schema: SchemaVersion.V2,
+    startPage: '/summary',
+    pages: [{
+      id: '449c053b-9201-4312-9a75-187afc6ba48b',
+      path: '/licence',
+      title: 'Licence',
+      components: [{
+        id: YES_NO_COMPONENT_ID,
+        name: 'xVrYaJ',
+        type: ComponentType.YesNoField,
+        title: 'Do you have a licence?',
+        shortDescription: 'Licence',
+        options: {
+          required: true
+        }
+      }],
+      next: []
+    }, {
+      id: '449c053b-9201-4312-9a75-187afc6ba48c',
+      path: '/summary',
+      title: 'Summary',
+      controller: ControllerType.Summary,
+      components: []
+    }],
+    lists: [],
+    sections: [],
+    conditions: []
+  };
+}
+
+/**
+ * A definition that passes schema validation but cannot be used by the
+ * engine: a ListItemRef condition points at the YesNoField (boolean), so the
+ * condition expression builder produces an unparseable expression. Distilled
+ * from a real production incident.
+ */
+export function buildBrokenConditionDefinition() {
+  const definition = buildDefinition();
+  definition.name = 'Broken condition fixture';
+  const questionPage = definition.pages[0]
+  // A YesNoField cannot legitimately carry a custom list — that is the
+  // corruption this fixture models — so the TS component types (rightly)
+  // have no `list` property here and a cast is required.
+;
+  questionPage.components[0].list = USER_TYPE_LIST_ID;
+  definition.lists = [{
+    id: USER_TYPE_LIST_ID,
+    name: 'XtfRYR',
+    title: 'User type list',
+    type: 'string',
+    items: [{
+      id: EXISTING_USER_ITEM_ID,
+      text: 'existing user',
+      value: 'existing user'
+    }, {
+      id: '2277c7e5-7fef-46c6-993b-d294116d6d6b',
+      text: 'new user',
+      value: 'new user'
+    }]
+  }];
+  definition.conditions = [{
+    id: '3f9d3a35-6dee-4706-806c-3f776129f631',
+    displayName: 'Existing user',
+    items: [{
+      id: '7d7f58ee-c860-4d24-8a13-de5cb9af53d8',
+      componentId: YES_NO_COMPONENT_ID,
+      operator: OperatorName.Is,
+      type: ConditionType.ListItemRef,
+      value: {
+        listId: USER_TYPE_LIST_ID,
+        itemId: [EXISTING_USER_ITEM_ID]
+      }
+    }]
+  }];
+  return definition;
+}
+
+/**
+ * A schema-valid definition whose first page names a controller that is
+ * neither built in nor registered by the host application.
+ */
+export function buildUnknownControllerDefinition() {
+  const definition = buildDefinition();
+  definition.name = 'Unknown controller fixture';
+  definition.pages[0].controller = 'NoSuchPageController';
+  return definition;
+}
+
+/**
+ * Schema-valid (component types are free strings in the schema), but the
+ * question uses a type the engine has no component class for.
+ */
+export function buildUnknownComponentDefinition() {
+  const definition = buildDefinition();
+  definition.name = 'Unknown component fixture';
+  const questionPage = definition.pages[0];
+  questionPage.components[0].type = 'MyUnknownField';
+  return definition;
+}
+
+/**
+ * A definition that fails schema validation: the question page appears
+ * twice, violating the pages uniqueness rule.
+ */
+export function buildSchemaInvalidDefinition() {
+  const definition = buildDefinition();
+  definition.name = 'Schema invalid fixture';
+  definition.pages.push(buildDefinition().pages[0]);
+  return definition;
+}
+//# sourceMappingURL=definitions.js.map

package/.server/server/plugins/engine/__stubs__/definitions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"definitions.js","names":["ComponentType","ConditionType","ControllerType","Engine","OperatorName","SchemaVersion","YES_NO_COMPONENT_ID","USER_TYPE_LIST_ID","EXISTING_USER_ITEM_ID","buildDefinition","name","engine","V2","schema","startPage","pages","id","path","title","components","type","YesNoField","shortDescription","options","required","next","controller","Summary","lists","sections","conditions","buildBrokenConditionDefinition","definition","questionPage","list","items","text","value","displayName","componentId","operator","Is","ListItemRef","listId","itemId","buildUnknownControllerDefinition","buildUnknownComponentDefinition","buildSchemaInvalidDefinition","push"],"sources":["../../../../../src/server/plugins/engine/__stubs__/definitions.ts"],"sourcesContent":["import {\n  ComponentType,\n  ConditionType,\n  ControllerType,\n  Engine,\n  OperatorName,\n  SchemaVersion,\n  type FormDefinition,\n  type PageQuestion\n} from '@defra/forms-model'\n\nconst YES_NO_COMPONENT_ID = 'a7c0242f-2a31-45b2-8c71-ff2ac7f53288'\nconst USER_TYPE_LIST_ID = '4fa26e9c-07cf-47cd-a9dd-5cec0dd3f544'\nconst EXISTING_USER_ITEM_ID = '55fe0067-d011-4d33-886c-e1aa266637c3'\n\n/**\n * A minimal, schema-valid V2 definition: one YesNo question page and a\n * summary page. Each call returns a fresh object, so tests can mutate their\n * copy freely without affecting each other.\n */\nexport function buildDefinition(): FormDefinition {\n  return {\n    name: 'Stub definition',\n    engine: Engine.V2,\n    schema: SchemaVersion.V2,\n    startPage: '/summary',\n    pages: [\n      {\n        id: '449c053b-9201-4312-9a75-187afc6ba48b',\n        path: '/licence',\n        title: 'Licence',\n        components: [\n          {\n            id: YES_NO_COMPONENT_ID,\n            name: 'xVrYaJ',\n            type: ComponentType.YesNoField,\n            title: 'Do you have a licence?',\n            shortDescription: 'Licence',\n            options: { required: true }\n          }\n        ],\n        next: []\n      },\n      {\n        id: '449c053b-9201-4312-9a75-187afc6ba48c',\n        path: '/summary',\n        title: 'Summary',\n        controller: ControllerType.Summary,\n        components: []\n      }\n    ],\n    lists: [],\n    sections: [],\n    conditions: []\n  }\n}\n\n/**\n * A definition that passes schema validation but cannot be used by the\n * engine: a ListItemRef condition points at the YesNoField (boolean), so the\n * condition expression builder produces an unparseable expression. Distilled\n * from a real production incident.\n */\nexport function buildBrokenConditionDefinition(): FormDefinition {\n  const definition = buildDefinition()\n\n  definition.name = 'Broken condition fixture'\n\n  const questionPage = definition.pages[0] as PageQuestion\n  // A YesNoField cannot legitimately carry a custom list — that is the\n  // corruption this fixture models — so the TS component types (rightly)\n  // have no `list` property here and a cast is required.\n  ;(questionPage.components[0] as { list?: string }).list = USER_TYPE_LIST_ID\n  definition.lists = [\n    {\n      id: USER_TYPE_LIST_ID,\n      name: 'XtfRYR',\n      title: 'User type list',\n      type: 'string',\n      items: [\n        {\n          id: EXISTING_USER_ITEM_ID,\n          text: 'existing user',\n          value: 'existing user'\n        },\n        {\n          id: '2277c7e5-7fef-46c6-993b-d294116d6d6b',\n          text: 'new user',\n          value: 'new user'\n        }\n      ]\n    }\n  ]\n  definition.conditions = [\n    {\n      id: '3f9d3a35-6dee-4706-806c-3f776129f631',\n      displayName: 'Existing user',\n      items: [\n        {\n          id: '7d7f58ee-c860-4d24-8a13-de5cb9af53d8',\n          componentId: YES_NO_COMPONENT_ID,\n          operator: OperatorName.Is,\n          type: ConditionType.ListItemRef,\n          value: {\n            listId: USER_TYPE_LIST_ID,\n            itemId: [EXISTING_USER_ITEM_ID]\n          }\n        }\n      ]\n    }\n  ]\n\n  return definition\n}\n\n/**\n * A schema-valid definition whose first page names a controller that is\n * neither built in nor registered by the host application.\n */\nexport function buildUnknownControllerDefinition(): FormDefinition {\n  const definition = buildDefinition()\n\n  definition.name = 'Unknown controller fixture'\n  definition.pages[0].controller =\n    'NoSuchPageController' as unknown as ControllerType\n\n  return definition\n}\n\n/**\n * Schema-valid (component types are free strings in the schema), but the\n * question uses a type the engine has no component class for.\n */\nexport function buildUnknownComponentDefinition(): FormDefinition {\n  const definition = buildDefinition()\n\n  definition.name = 'Unknown component fixture'\n  const questionPage = definition.pages[0] as PageQuestion\n  questionPage.components[0].type = 'MyUnknownField' as unknown as ComponentType\n\n  return definition\n}\n\n/**\n * A definition that fails schema validation: the question page appears\n * twice, violating the pages uniqueness rule.\n */\nexport function buildSchemaInvalidDefinition(): FormDefinition {\n  const definition = buildDefinition()\n\n  definition.name = 'Schema invalid fixture'\n  definition.pages.push(buildDefinition().pages[0])\n\n  return definition\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,6 +1,8 @@
 import { type AutocompleteFieldComponent } from '@defra/forms-model';
+import { type LanguageMessages } from 'joi';
 import { SelectField } from '../../../../server/plugins/engine/components/SelectField.js';
 import { type RenderContext } from '../../../../server/plugins/engine/components/types.js';
+import { type Translator } from '../../../../server/plugins/engine/types/index.js';
 export declare class AutocompleteField extends SelectField {
     options: AutocompleteFieldComponent['options'];
     constructor(def: AutocompleteFieldComponent, props: ConstructorParameters<typeof SelectField>[1]);
@@ -15,7 +17,7 @@ export declare class AutocompleteField extends SelectField {
         };
         id: string;
         name: string;
-        value: import("../types.js").FormValue;
+        value: import("../../../../server/plugins/engine/types/index.js").FormValue;
         type?: string;
         hint?: {
             id?: string;
@@ -25,7 +27,7 @@ export declare class AutocompleteField extends SelectField {
         suffix?: import("../../../../server/plugins/engine/components/types.js").ComponentText;
         classes?: string;
         condition?: string;
-        errors?: import("../types.js").FormSubmissionError[];
+        errors?: import("../../../../server/plugins/engine/types/index.js").FormSubmissionError[];
         errorMessage?: {
             text: string;
         };
@@ -50,7 +52,11 @@ export declare class AutocompleteField extends SelectField {
         components?: import("../../../../server/plugins/engine/components/types.js").ComponentViewModel[];
         upload?: {
             count: number;
-            summaryList: import("../types.js").SummaryList;
+            summaryList: import("../../../../server/plugins/engine/types/index.js").SummaryList;
+            uploadingLabel?: string;
         };
     };
+    getValidationMessagesOverride(translator: Translator): {
+        [x: string]: LanguageMessages;
+    };
 }

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

@@ -1,4 +1,5 @@
 import { SelectField } from "./SelectField.js";
+import { buildValidationMessages } from "../i18n/buildValidationMessages.js";
 import { messageTemplate } from "../pageControllers/validationOptions.js";
 export class AutocompleteField extends SelectField {
   constructor(def, props) {
@@ -33,5 +34,16 @@ export class AutocompleteField extends SelectField {
       formGroup
     };
   }
+  getValidationMessagesOverride(translator) {
+    const {
+      t
+    } = translator;
+    return {
+      [this.name]: {
+        'any.required': buildValidationMessages(t).objectRequired,
+        'any.only': buildValidationMessages(t).objectRequired
+      }
+    };
+  }
 }
 //# sourceMappingURL=AutocompleteField.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"AutocompleteField.js","names":["SelectField","messageTemplate","AutocompleteField","constructor","def","props","options","formSchema","required","messages","customValidationMessages","getViewModel","context","viewModel","formGroup","attributes"],"sources":["../../../../../src/server/plugins/engine/components/AutocompleteField.ts"],"sourcesContent":["import { type AutocompleteFieldComponent } from '@defra/forms-model'\n\nimport { SelectField } from '~/src/server/plugins/engine/components/SelectField.js'\nimport { type RenderContext } from '~/src/server/plugins/engine/components/types.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\n\nexport class AutocompleteField extends SelectField {\n  declare options: AutocompleteFieldComponent['options']\n\n  constructor(\n    def: AutocompleteFieldComponent,\n    props: ConstructorParameters<typeof SelectField>[1]\n  ) {\n    super(def, props)\n\n    const { options } = def\n    let { formSchema } = this\n\n    if (options.required !== false) {\n      const messages = options.customValidationMessages\n\n      formSchema = formSchema.messages({\n        'any.only':\n          messages?.['any.only'] ?? (messageTemplate.required as string),\n        'any.required':\n          messages?.['any.required'] ?? (messageTemplate.required as string)\n      })\n    }\n\n    this.options = options\n    this.formSchema = formSchema\n  }\n\n  getViewModel(context: RenderContext) {\n    const viewModel = super.getViewModel(context)\n    let { formGroup } = viewModel\n\n    formGroup ??= {}\n    formGroup.attributes = {\n      'data-module': 'govuk-accessible-autocomplete'\n    }\n\n    return {\n      ...viewModel,\n      formGroup\n    }\n  }\n}\n"],"mappings":"AAEA,SAASA,WAAW;AAEpB,SAASC,eAAe;AAExB,OAAO,MAAMC,iBAAiB,SAASF,WAAW,CAAC;EAGjDG,WAAWA,CACTC,GAA+B,EAC/BC,KAAmD,EACnD;IACA,KAAK,CAACD,GAAG,EAAEC,KAAK,CAAC;IAEjB,MAAM;MAAEC;IAAQ,CAAC,GAAGF,GAAG;IACvB,IAAI;MAAEG;IAAW,CAAC,GAAG,IAAI;IAEzB,IAAID,OAAO,CAACE,QAAQ,KAAK,KAAK,EAAE;MAC9B,MAAMC,QAAQ,GAAGH,OAAO,CAACI,wBAAwB;MAEjDH,UAAU,GAAGA,UAAU,CAACE,QAAQ,CAAC;QAC/B,UAAU,EACRA,QAAQ,GAAG,UAAU,CAAC,IAAKR,eAAe,CAACO,QAAmB;QAChE,cAAc,EACZC,QAAQ,GAAG,cAAc,CAAC,IAAKR,eAAe,CAACO;MACnD,CAAC,CAAC;IACJ;IAEA,IAAI,CAACF,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,UAAU,GAAGA,UAAU;EAC9B;EAEAI,YAAYA,CAACC,OAAsB,EAAE;IACnC,MAAMC,SAAS,GAAG,KAAK,CAACF,YAAY,CAACC,OAAO,CAAC;IAC7C,IAAI;MAAEE;IAAU,CAAC,GAAGD,SAAS;IAE7BC,SAAS,KAAK,CAAC,CAAC;IAChBA,SAAS,CAACC,UAAU,GAAG;MACrB,aAAa,EAAE;IACjB,CAAC;IAED,OAAO;MACL,GAAGF,SAAS;MACZC;IACF,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"file":"AutocompleteField.js","names":["SelectField","buildValidationMessages","messageTemplate","AutocompleteField","constructor","def","props","options","formSchema","required","messages","customValidationMessages","getViewModel","context","viewModel","formGroup","attributes","getValidationMessagesOverride","translator","t","name","objectRequired"],"sources":["../../../../../src/server/plugins/engine/components/AutocompleteField.ts"],"sourcesContent":["import { type AutocompleteFieldComponent } from '@defra/forms-model'\nimport { type LanguageMessages } from 'joi'\n\nimport { SelectField } from '~/src/server/plugins/engine/components/SelectField.js'\nimport { type RenderContext } from '~/src/server/plugins/engine/components/types.js'\nimport { buildValidationMessages } from '~/src/server/plugins/engine/i18n/buildValidationMessages.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport { type Translator } from '~/src/server/plugins/engine/types/index.js'\n\nexport class AutocompleteField extends SelectField {\n  declare options: AutocompleteFieldComponent['options']\n\n  constructor(\n    def: AutocompleteFieldComponent,\n    props: ConstructorParameters<typeof SelectField>[1]\n  ) {\n    super(def, props)\n\n    const { options } = def\n    let { formSchema } = this\n\n    if (options.required !== false) {\n      const messages = options.customValidationMessages\n\n      formSchema = formSchema.messages({\n        'any.only':\n          messages?.['any.only'] ?? (messageTemplate.required as string),\n        'any.required':\n          messages?.['any.required'] ?? (messageTemplate.required as string)\n      })\n    }\n\n    this.options = options\n    this.formSchema = formSchema\n  }\n\n  getViewModel(context: RenderContext) {\n    const viewModel = super.getViewModel(context)\n    let { formGroup } = viewModel\n\n    formGroup ??= {}\n    formGroup.attributes = {\n      'data-module': 'govuk-accessible-autocomplete'\n    }\n\n    return {\n      ...viewModel,\n      formGroup\n    }\n  }\n\n  getValidationMessagesOverride(translator: Translator) {\n    const { t } = translator\n    return {\n      [this.name]: {\n        'any.required': buildValidationMessages(t).objectRequired,\n        'any.only': buildValidationMessages(t).objectRequired\n      } as LanguageMessages\n    }\n  }\n}\n"],"mappings":"AAGA,SAASA,WAAW;AAEpB,SAASC,uBAAuB;AAChC,SAASC,eAAe;AAGxB,OAAO,MAAMC,iBAAiB,SAASH,WAAW,CAAC;EAGjDI,WAAWA,CACTC,GAA+B,EAC/BC,KAAmD,EACnD;IACA,KAAK,CAACD,GAAG,EAAEC,KAAK,CAAC;IAEjB,MAAM;MAAEC;IAAQ,CAAC,GAAGF,GAAG;IACvB,IAAI;MAAEG;IAAW,CAAC,GAAG,IAAI;IAEzB,IAAID,OAAO,CAACE,QAAQ,KAAK,KAAK,EAAE;MAC9B,MAAMC,QAAQ,GAAGH,OAAO,CAACI,wBAAwB;MAEjDH,UAAU,GAAGA,UAAU,CAACE,QAAQ,CAAC;QAC/B,UAAU,EACRA,QAAQ,GAAG,UAAU,CAAC,IAAKR,eAAe,CAACO,QAAmB;QAChE,cAAc,EACZC,QAAQ,GAAG,cAAc,CAAC,IAAKR,eAAe,CAACO;MACnD,CAAC,CAAC;IACJ;IAEA,IAAI,CAACF,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,UAAU,GAAGA,UAAU;EAC9B;EAEAI,YAAYA,CAACC,OAAsB,EAAE;IACnC,MAAMC,SAAS,GAAG,KAAK,CAACF,YAAY,CAACC,OAAO,CAAC;IAC7C,IAAI;MAAEE;IAAU,CAAC,GAAGD,SAAS;IAE7BC,SAAS,KAAK,CAAC,CAAC;IAChBA,SAAS,CAACC,UAAU,GAAG;MACrB,aAAa,EAAE;IACjB,CAAC;IAED,OAAO;MACL,GAAGF,SAAS;MACZC;IACF,CAAC;EACH;EAEAE,6BAA6BA,CAACC,UAAsB,EAAE;IACpD,MAAM;MAAEC;IAAE,CAAC,GAAGD,UAAU;IACxB,OAAO;MACL,CAAC,IAAI,CAACE,IAAI,GAAG;QACX,cAAc,EAAEnB,uBAAuB,CAACkB,CAAC,CAAC,CAACE,cAAc;QACzD,UAAU,EAAEpB,uBAAuB,CAACkB,CAAC,CAAC,CAACE;MACzC;IACF,CAAC;EACH;AACF","ignoreList":[]}

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

@@ -8,6 +8,11 @@ export declare class CheckboxesField extends SelectionControlField {
     schema: CheckboxesFieldComponent['schema'];
     formSchema: ArraySchema<string> | ArraySchema<number>;
     stateSchema: ArraySchema<string> | ArraySchema<number>;
+    limits: {
+        min?: number;
+        max?: number;
+        length?: number;
+    };
     constructor(def: CheckboxesFieldComponent, props: ConstructorParameters<typeof SelectionControlField>[1]);
     getFormValueFromState(state: FormSubmissionState): (string | number | boolean)[] | undefined;
     getFormValue(value?: FormStateValue | FormState): (string | number | boolean)[] | undefined;
@@ -15,6 +20,13 @@ export declare class CheckboxesField extends SelectionControlField {
     getContextValueFromFormValue(values: (string | number | boolean)[] | undefined): (string | number | boolean)[];
     getDisplayStringFromState(state: FormSubmissionState, translator: Translator): string;
     getContextValueFromState(state: FormSubmissionState): (string | number | boolean)[];
+    getValidationMessagesOverride(translator: Translator): {
+        [x: string]: {
+            'array.min': string;
+            'array.max': string;
+            'array.length': string;
+        };
+    };
     /**
      * For error preview page that shows all possible errors on a component
      */
@@ -24,4 +36,13 @@ export declare class CheckboxesField extends SelectionControlField {
      */
     static getAllPossibleErrors(): ErrorMessageTemplateList;
     isValue(value?: FormStateValue | FormState): value is Item['value'][];
+    static buildErrorMessages(language: string, limits?: {
+        min?: number;
+        max?: number;
+        length?: number;
+    }): {
+        'array.min': string;
+        'array.max': string;
+        'array.length': string;
+    };
 }

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

@@ -1,6 +1,8 @@
 import joi from 'joi';
+import { EN_GB } from "../../../constants.js";
 import { isFormValue } from "./FormComponent.js";
 import { SelectionControlField } from "./SelectionControlField.js";
+import { t as tPlugin } from "../i18n/index.js";
 import { messageTemplate } from "../pageControllers/validationOptions.js";
 export class CheckboxesField extends SelectionControlField {
   constructor(def, props) {
@@ -14,24 +16,26 @@ export class CheckboxesField extends SelectionControlField {
     } = def;
     let formSchema = type === 'string' ? joi.array() : joi.array();
     const itemsSchema = joi[type]().valid(...this.values).label(this.label);
-    formSchema = formSchema.items(itemsSchema).single().label(this.label).required().messages({
-      'array.min': messageTemplate.arrayMin,
-      'array.max': messageTemplate.arrayMax,
-      'array.length': messageTemplate.arrayLength
-    });
+    formSchema = formSchema.items(itemsSchema).single().label(this.label).required();
+    const limits = {};
     if (options.required === false) {
       formSchema = formSchema.optional();
     }
     if (typeof schema?.length === 'number') {
       formSchema = formSchema.length(schema.length);
+      limits.length = schema.length;
     } else {
       if (typeof schema?.min === 'number') {
         formSchema = formSchema.min(schema.min);
+        limits.min = schema.min;
       }
       if (typeof schema?.max === 'number') {
         formSchema = formSchema.max(schema.max);
+        limits.max = schema.max;
       }
     }
+    this.limits = limits;
+    formSchema = formSchema.messages(CheckboxesField.buildErrorMessages(EN_GB, limits));
     this.formSchema = formSchema.default([]);
     this.stateSchema = formSchema.default(null).allow(null);
     this.options = options;
@@ -83,6 +87,14 @@ export class CheckboxesField extends SelectionControlField {
     const values = this.getFormValueFromState(state);
     return this.getContextValueFromFormValue(values);
   }
+  getValidationMessagesOverride(translator) {
+    const {
+      language
+    } = translator;
+    return {
+      [this.name]: CheckboxesField.buildErrorMessages(language, this.limits)
+    };
+  }
 
   /**
    * For error preview page that shows all possible errors on a component
@@ -121,5 +133,18 @@ export class CheckboxesField extends SelectionControlField {
     }
     return value.every(isFormValue);
   }
+  static buildErrorMessages(language, limits = {}) {
+    return {
+      'array.min': tPlugin('validation.arrayMin', language, {
+        count: limits.min ?? 1
+      }),
+      'array.max': tPlugin('validation.arrayMax', language, {
+        count: limits.max ?? 1
+      }),
+      'array.length': tPlugin('validation.arrayLength', language, {
+        count: limits.length ?? 1
+      })
+    };
+  }
 }
 //# sourceMappingURL=CheckboxesField.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"CheckboxesField.js","names":["joi","isFormValue","SelectionControlField","messageTemplate","CheckboxesField","constructor","def","props","listType","type","options","schema","formSchema","array","itemsSchema","valid","values","label","items","single","required","messages","arrayMin","arrayMax","arrayLength","optional","length","min","max","default","stateSchema","allow","getFormValueFromState","state","name","getFormValue","selected","filter","item","includes","value","map","undefined","isValue","getDisplayStringFromFormValue","translator","tListItem","text","join","getContextValueFromFormValue","getDisplayStringFromState","getContextValueFromState","getAllPossibleErrors","parentErrors","advancedSettingsErrors","template","Array","isArray","every"],"sources":["../../../../../src/server/plugins/engine/components/CheckboxesField.ts"],"sourcesContent":["import { type CheckboxesFieldComponent, type Item } from '@defra/forms-model'\nimport joi, { type ArraySchema } from 'joi'\n\nimport { isFormValue } from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { SelectionControlField } from '~/src/server/plugins/engine/components/SelectionControlField.js'\nimport { type Translator } from '~/src/server/plugins/engine/i18n/types.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'\nimport { type QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormState,\n  type FormStateValue,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\n\nexport class CheckboxesField extends SelectionControlField {\n  declare options: CheckboxesFieldComponent['options']\n  declare schema: CheckboxesFieldComponent['schema']\n  declare formSchema: ArraySchema<string> | ArraySchema<number>\n  declare stateSchema: ArraySchema<string> | ArraySchema<number>\n\n  constructor(\n    def: CheckboxesFieldComponent,\n    props: ConstructorParameters<typeof SelectionControlField>[1]\n  ) {\n    super(def, props)\n\n    const { listType: type } = this\n    const { options, schema } = def\n\n    let formSchema =\n      type === 'string' ? joi.array<string>() : joi.array<number>()\n\n    const itemsSchema = joi[type]()\n      .valid(...this.values)\n      .label(this.label)\n\n    formSchema = formSchema\n      .items(itemsSchema)\n      .single()\n      .label(this.label)\n      .required()\n      .messages({\n        'array.min': messageTemplate.arrayMin,\n        'array.max': messageTemplate.arrayMax,\n        'array.length': messageTemplate.arrayLength\n      })\n\n    if (options.required === false) {\n      formSchema = formSchema.optional()\n    }\n\n    if (typeof schema?.length === 'number') {\n      formSchema = formSchema.length(schema.length)\n    } else {\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\n    this.formSchema = formSchema.default([])\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = options\n  }\n\n  getFormValueFromState(state: FormSubmissionState) {\n    const { items, name } = this\n\n    // State checkbox values\n    const values = this.getFormValue(state[name]) ?? []\n\n    // Map (or discard) state values to item values\n    const selected = items\n      .filter((item) => values.includes(item.value))\n      .map((item) => item.value)\n\n    return selected.length ? selected : undefined\n  }\n\n  getFormValue(value?: FormStateValue | FormState) {\n    return this.isValue(value) ? value : undefined\n  }\n\n  getDisplayStringFromFormValue(\n    selected: (string | number | boolean)[] | undefined,\n    translator: Translator\n  ) {\n    const { items } = this\n\n    if (!selected) {\n      return ''\n    }\n\n    return items\n      .filter((item) => selected.includes(item.value))\n      .map((item) => translator.tListItem(item, 'text') || item.text)\n      .join(', ')\n  }\n\n  getContextValueFromFormValue(\n    values: (string | number | boolean)[] | undefined\n  ): (string | number | boolean)[] {\n    /**\n     * For evaluation context purposes, optional {@link CheckboxesField}\n     * with an undefined value (i.e. nothing selected) should default to [].\n     * This way conditions are not evaluated against `undefined` which throws errors.\n     * Currently these errors are caught and the evaluation returns default `false`.\n     * @see {@link QuestionPageController.getNextPath} for `undefined` return value\n     * @see {@link FormModel.makeCondition} for try/catch block with default `false`\n     * For negative conditions this is a problem because E.g.\n     * The condition: 'selectedchecks' does not contain 'someval'\n     * should return true IF 'selectedchecks' is undefined, not throw and return false.\n     */\n    return values ?? []\n  }\n\n  getDisplayStringFromState(\n    state: FormSubmissionState,\n    translator: Translator\n  ) {\n    const selected = this.getFormValueFromState(state) ?? []\n    return this.getDisplayStringFromFormValue(selected, translator)\n  }\n\n  getContextValueFromState(state: FormSubmissionState) {\n    const values = this.getFormValueFromState(state)\n\n    return this.getContextValueFromFormValue(values)\n  }\n\n  /**\n   * For error preview page that shows all possible errors on a component\n   */\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    return CheckboxesField.getAllPossibleErrors()\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors(): ErrorMessageTemplateList {\n    const parentErrors = SelectionControlField.getAllPossibleErrors()\n\n    return {\n      ...parentErrors,\n      advancedSettingsErrors: [\n        ...parentErrors.advancedSettingsErrors,\n        { type: 'array.min', template: messageTemplate.arrayMin },\n        { type: 'array.max', template: messageTemplate.arrayMax },\n        { type: 'array.length', template: messageTemplate.arrayLength }\n      ]\n    }\n  }\n\n  isValue(value?: FormStateValue | FormState): value is Item['value'][] {\n    if (!Array.isArray(value)) {\n      return false\n    }\n\n    // Skip checks when empty\n    if (!value.length) {\n      return true\n    }\n\n    return value.every(isFormValue)\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"CheckboxesField.js","names":["joi","EN_GB","isFormValue","SelectionControlField","t","tPlugin","messageTemplate","CheckboxesField","constructor","def","props","listType","type","options","schema","formSchema","array","itemsSchema","valid","values","label","items","single","required","limits","optional","length","min","max","messages","buildErrorMessages","default","stateSchema","allow","getFormValueFromState","state","name","getFormValue","selected","filter","item","includes","value","map","undefined","isValue","getDisplayStringFromFormValue","translator","tListItem","text","join","getContextValueFromFormValue","getDisplayStringFromState","getContextValueFromState","getValidationMessagesOverride","language","getAllPossibleErrors","parentErrors","advancedSettingsErrors","template","arrayMin","arrayMax","arrayLength","Array","isArray","every","count"],"sources":["../../../../../src/server/plugins/engine/components/CheckboxesField.ts"],"sourcesContent":["import { type CheckboxesFieldComponent, type Item } from '@defra/forms-model'\nimport joi, { type ArraySchema } from 'joi'\n\nimport { EN_GB } from '~/src/server/constants.js'\nimport { isFormValue } from '~/src/server/plugins/engine/components/FormComponent.js'\nimport { SelectionControlField } from '~/src/server/plugins/engine/components/SelectionControlField.js'\nimport { t as tPlugin } from '~/src/server/plugins/engine/i18n/index.js'\nimport { type Translator } from '~/src/server/plugins/engine/i18n/types.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'\nimport { type QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js'\nimport { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport {\n  type ErrorMessageTemplateList,\n  type FormState,\n  type FormStateValue,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\n\nexport class CheckboxesField extends SelectionControlField {\n  declare options: CheckboxesFieldComponent['options']\n  declare schema: CheckboxesFieldComponent['schema']\n  declare formSchema: ArraySchema<string> | ArraySchema<number>\n  declare stateSchema: ArraySchema<string> | ArraySchema<number>\n  declare limits: { min?: number; max?: number; length?: number }\n\n  constructor(\n    def: CheckboxesFieldComponent,\n    props: ConstructorParameters<typeof SelectionControlField>[1]\n  ) {\n    super(def, props)\n\n    const { listType: type } = this\n    const { options, schema } = def\n\n    let formSchema =\n      type === 'string' ? joi.array<string>() : joi.array<number>()\n\n    const itemsSchema = joi[type]()\n      .valid(...this.values)\n      .label(this.label)\n\n    formSchema = formSchema\n      .items(itemsSchema)\n      .single()\n      .label(this.label)\n      .required()\n\n    const limits: { min?: number; max?: number; length?: number } = {}\n\n    if (options.required === false) {\n      formSchema = formSchema.optional()\n    }\n\n    if (typeof schema?.length === 'number') {\n      formSchema = formSchema.length(schema.length)\n      limits.length = schema.length\n    } else {\n      if (typeof schema?.min === 'number') {\n        formSchema = formSchema.min(schema.min)\n        limits.min = schema.min\n      }\n\n      if (typeof schema?.max === 'number') {\n        formSchema = formSchema.max(schema.max)\n        limits.max = schema.max\n      }\n    }\n\n    this.limits = limits\n\n    formSchema = formSchema.messages(\n      CheckboxesField.buildErrorMessages(EN_GB, limits)\n    )\n\n    this.formSchema = formSchema.default([])\n    this.stateSchema = formSchema.default(null).allow(null)\n    this.options = options\n  }\n\n  getFormValueFromState(state: FormSubmissionState) {\n    const { items, name } = this\n\n    // State checkbox values\n    const values = this.getFormValue(state[name]) ?? []\n\n    // Map (or discard) state values to item values\n    const selected = items\n      .filter((item) => values.includes(item.value))\n      .map((item) => item.value)\n\n    return selected.length ? selected : undefined\n  }\n\n  getFormValue(value?: FormStateValue | FormState) {\n    return this.isValue(value) ? value : undefined\n  }\n\n  getDisplayStringFromFormValue(\n    selected: (string | number | boolean)[] | undefined,\n    translator: Translator\n  ) {\n    const { items } = this\n\n    if (!selected) {\n      return ''\n    }\n\n    return items\n      .filter((item) => selected.includes(item.value))\n      .map((item) => translator.tListItem(item, 'text') || item.text)\n      .join(', ')\n  }\n\n  getContextValueFromFormValue(\n    values: (string | number | boolean)[] | undefined\n  ): (string | number | boolean)[] {\n    /**\n     * For evaluation context purposes, optional {@link CheckboxesField}\n     * with an undefined value (i.e. nothing selected) should default to [].\n     * This way conditions are not evaluated against `undefined` which throws errors.\n     * Currently these errors are caught and the evaluation returns default `false`.\n     * @see {@link QuestionPageController.getNextPath} for `undefined` return value\n     * @see {@link FormModel.makeCondition} for try/catch block with default `false`\n     * For negative conditions this is a problem because E.g.\n     * The condition: 'selectedchecks' does not contain 'someval'\n     * should return true IF 'selectedchecks' is undefined, not throw and return false.\n     */\n    return values ?? []\n  }\n\n  getDisplayStringFromState(\n    state: FormSubmissionState,\n    translator: Translator\n  ) {\n    const selected = this.getFormValueFromState(state) ?? []\n    return this.getDisplayStringFromFormValue(selected, translator)\n  }\n\n  getContextValueFromState(state: FormSubmissionState) {\n    const values = this.getFormValueFromState(state)\n\n    return this.getContextValueFromFormValue(values)\n  }\n\n  getValidationMessagesOverride(translator: Translator) {\n    const { language } = translator\n    return {\n      [this.name]: CheckboxesField.buildErrorMessages(language, this.limits)\n    }\n  }\n\n  /**\n   * For error preview page that shows all possible errors on a component\n   */\n  getAllPossibleErrors(): ErrorMessageTemplateList {\n    return CheckboxesField.getAllPossibleErrors()\n  }\n\n  /**\n   * Static version of getAllPossibleErrors that doesn't require a component instance.\n   */\n  static getAllPossibleErrors(): ErrorMessageTemplateList {\n    const parentErrors = SelectionControlField.getAllPossibleErrors()\n\n    return {\n      ...parentErrors,\n      advancedSettingsErrors: [\n        ...parentErrors.advancedSettingsErrors,\n        { type: 'array.min', template: messageTemplate.arrayMin },\n        { type: 'array.max', template: messageTemplate.arrayMax },\n        { type: 'array.length', template: messageTemplate.arrayLength }\n      ]\n    }\n  }\n\n  isValue(value?: FormStateValue | FormState): value is Item['value'][] {\n    if (!Array.isArray(value)) {\n      return false\n    }\n\n    // Skip checks when empty\n    if (!value.length) {\n      return true\n    }\n\n    return value.every(isFormValue)\n  }\n\n  static buildErrorMessages(\n    language: string,\n    limits: { min?: number; max?: number; length?: number } = {}\n  ) {\n    return {\n      'array.min': tPlugin('validation.arrayMin', language, {\n        count: limits.min ?? 1\n      }),\n      'array.max': tPlugin('validation.arrayMax', language, {\n        count: limits.max ?? 1\n      }),\n      'array.length': tPlugin('validation.arrayLength', language, {\n        count: limits.length ?? 1\n      })\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -21,6 +21,7 @@ export declare class ComponentBase {
     }>['options'];
     isFormComponent: boolean;
     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;
     stateSchema: ComponentSchema;

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

@@ -12,6 +12,7 @@ export class ComponentBase {
   options;
   isFormComponent = false;
   model;
+  def;
 
   /** joi schemas based on a component defined in the form JSON. This validates a user's answer and is generated from {@link ComponentDef} */
   formSchema = joi.string();
@@ -21,6 +22,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;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"ComponentBase.js","names":["isConditionalRevealType","joi","ComponentBase","id","page","parent","collection","type","name","title","schema","options","isFormComponent","model","formSchema","string","stateSchema","constructor","def","props","viewModel","attributes","autocomplete","classes","condition"],"sources":["../../../../../src/server/plugins/engine/components/ComponentBase.ts"],"sourcesContent":["import { isConditionalRevealType, type ComponentDef } from '@defra/forms-model'\nimport joi, {\n  type ArraySchema,\n  type BooleanSchema,\n  type DateSchema,\n  type NumberSchema,\n  type ObjectSchema,\n  type StringSchema\n} from 'joi'\n\nimport { type ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'\nimport { type Component } from '~/src/server/plugins/engine/components/helpers/components.js'\nimport { type ViewModel } from '~/src/server/plugins/engine/components/types.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'\n\nexport class ComponentBase {\n  id?: string\n  page?: PageControllerClass\n  parent: Component | undefined\n  collection: ComponentCollection | undefined\n\n  type: ComponentDef['type']\n  name: ComponentDef['name']\n  title: ComponentDef['title']\n  schema?: Extract<ComponentDef, { schema?: object }>['schema']\n  options?: Extract<ComponentDef, { options: object }>['options']\n\n  isFormComponent = false\n  model: FormModel\n\n  /** joi schemas based on a component defined in the form JSON. This validates a user's answer and is generated from {@link ComponentDef} */\n  formSchema: ComponentSchema = joi.string()\n  stateSchema: ComponentSchema = joi.string()\n\n  constructor(\n    def: ComponentDef,\n    props: {\n      page?: PageControllerClass\n      parent?: Component\n      model: FormModel\n    }\n  ) {\n    this.id = def.id\n    this.type = def.type\n    this.name = def.name\n    this.title = def.title\n\n    if ('schema' in def) {\n      this.schema = def.schema\n    }\n\n    if ('options' in def) {\n      this.options = def.options\n    }\n\n    this.page = props.page\n    this.parent = props.parent\n    this.model = props.model\n  }\n\n  get viewModel() {\n    const { options, type } = this\n\n    const viewModel: ViewModel = {\n      attributes: {}\n    }\n\n    if (!options) {\n      return viewModel\n    }\n\n    if ('autocomplete' in options) {\n      viewModel.attributes.autocomplete = options.autocomplete\n    }\n\n    if ('classes' in options) {\n      viewModel.classes = options.classes\n    }\n\n    if ('condition' in options && isConditionalRevealType(type)) {\n      viewModel.condition = options.condition\n    }\n\n    return viewModel\n  }\n}\n\nexport type ComponentSchema =\n  | ArraySchema<string>\n  | ArraySchema<number>\n  | ArraySchema<boolean>\n  | ArraySchema<object>\n  | BooleanSchema<string>\n  | BooleanSchema\n  | DateSchema\n  | NumberSchema<string>\n  | NumberSchema\n  | ObjectSchema\n  | StringSchema\n"],"mappings":"AAAA,SAASA,uBAAuB,QAA2B,oBAAoB;AAC/E,OAAOC,GAAG,MAOH,KAAK;AAQZ,OAAO,MAAMC,aAAa,CAAC;EACzBC,EAAE;EACFC,IAAI;EACJC,MAAM;EACNC,UAAU;EAEVC,IAAI;EACJC,IAAI;EACJC,KAAK;EACLC,MAAM;EACNC,OAAO;EAEPC,eAAe,GAAG,KAAK;EACvBC,KAAK;;EAEL;EACAC,UAAU,GAAoBb,GAAG,CAACc,MAAM,CAAC,CAAC;EAC1CC,WAAW,GAAoBf,GAAG,CAACc,MAAM,CAAC,CAAC;EAE3CE,WAAWA,CACTC,GAAiB,EACjBC,KAIC,EACD;IACA,IAAI,CAAChB,EAAE,GAAGe,GAAG,CAACf,EAAE;IAChB,IAAI,CAACI,IAAI,GAAGW,GAAG,CAACX,IAAI;IACpB,IAAI,CAACC,IAAI,GAAGU,GAAG,CAACV,IAAI;IACpB,IAAI,CAACC,KAAK,GAAGS,GAAG,CAACT,KAAK;IAEtB,IAAI,QAAQ,IAAIS,GAAG,EAAE;MACnB,IAAI,CAACR,MAAM,GAAGQ,GAAG,CAACR,MAAM;IAC1B;IAEA,IAAI,SAAS,IAAIQ,GAAG,EAAE;MACpB,IAAI,CAACP,OAAO,GAAGO,GAAG,CAACP,OAAO;IAC5B;IAEA,IAAI,CAACP,IAAI,GAAGe,KAAK,CAACf,IAAI;IACtB,IAAI,CAACC,MAAM,GAAGc,KAAK,CAACd,MAAM;IAC1B,IAAI,CAACQ,KAAK,GAAGM,KAAK,CAACN,KAAK;EAC1B;EAEA,IAAIO,SAASA,CAAA,EAAG;IACd,MAAM;MAAET,OAAO;MAAEJ;IAAK,CAAC,GAAG,IAAI;IAE9B,MAAMa,SAAoB,GAAG;MAC3BC,UAAU,EAAE,CAAC;IACf,CAAC;IAED,IAAI,CAACV,OAAO,EAAE;MACZ,OAAOS,SAAS;IAClB;IAEA,IAAI,cAAc,IAAIT,OAAO,EAAE;MAC7BS,SAAS,CAACC,UAAU,CAACC,YAAY,GAAGX,OAAO,CAACW,YAAY;IAC1D;IAEA,IAAI,SAAS,IAAIX,OAAO,EAAE;MACxBS,SAAS,CAACG,OAAO,GAAGZ,OAAO,CAACY,OAAO;IACrC;IAEA,IAAI,WAAW,IAAIZ,OAAO,IAAIX,uBAAuB,CAACO,IAAI,CAAC,EAAE;MAC3Da,SAAS,CAACI,SAAS,GAAGb,OAAO,CAACa,SAAS;IACzC;IAEA,OAAOJ,SAAS;EAClB;AACF","ignoreList":[]}
+{"version":3,"file":"ComponentBase.js","names":["isConditionalRevealType","joi","ComponentBase","id","page","parent","collection","type","name","title","schema","options","isFormComponent","model","def","formSchema","string","stateSchema","constructor","props","viewModel","attributes","autocomplete","classes","condition"],"sources":["../../../../../src/server/plugins/engine/components/ComponentBase.ts"],"sourcesContent":["import { isConditionalRevealType, type ComponentDef } from '@defra/forms-model'\nimport joi, {\n  type ArraySchema,\n  type BooleanSchema,\n  type DateSchema,\n  type NumberSchema,\n  type ObjectSchema,\n  type StringSchema\n} from 'joi'\n\nimport { type ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'\nimport { type Component } from '~/src/server/plugins/engine/components/helpers/components.js'\nimport { type ViewModel } from '~/src/server/plugins/engine/components/types.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'\n\nexport class ComponentBase {\n  id?: string\n  page?: PageControllerClass\n  parent: Component | undefined\n  collection: ComponentCollection | undefined\n\n  type: ComponentDef['type']\n  name: ComponentDef['name']\n  title: ComponentDef['title']\n  schema?: Extract<ComponentDef, { schema?: object }>['schema']\n  options?: Extract<ComponentDef, { options: object }>['options']\n\n  isFormComponent = false\n  model: FormModel\n  def: ComponentDef\n\n  /** joi schemas based on a component defined in the form JSON. This validates a user's answer and is generated from {@link ComponentDef} */\n  formSchema: ComponentSchema = joi.string()\n  stateSchema: ComponentSchema = joi.string()\n\n  constructor(\n    def: ComponentDef,\n    props: {\n      page?: PageControllerClass\n      parent?: Component\n      model: FormModel\n    }\n  ) {\n    this.id = def.id\n    this.type = def.type\n    this.name = def.name\n    this.title = def.title\n    this.def = def\n\n    if ('schema' in def) {\n      this.schema = def.schema\n    }\n\n    if ('options' in def) {\n      this.options = def.options\n    }\n\n    this.page = props.page\n    this.parent = props.parent\n    this.model = props.model\n  }\n\n  get viewModel() {\n    const { options, type } = this\n\n    const viewModel: ViewModel = {\n      attributes: {}\n    }\n\n    if (!options) {\n      return viewModel\n    }\n\n    if ('autocomplete' in options) {\n      viewModel.attributes.autocomplete = options.autocomplete\n    }\n\n    if ('classes' in options) {\n      viewModel.classes = options.classes\n    }\n\n    if ('condition' in options && isConditionalRevealType(type)) {\n      viewModel.condition = options.condition\n    }\n\n    return viewModel\n  }\n}\n\nexport type ComponentSchema =\n  | ArraySchema<string>\n  | ArraySchema<number>\n  | ArraySchema<boolean>\n  | ArraySchema<object>\n  | BooleanSchema<string>\n  | BooleanSchema\n  | DateSchema\n  | NumberSchema<string>\n  | NumberSchema\n  | ObjectSchema\n  | StringSchema\n"],"mappings":"AAAA,SAASA,uBAAuB,QAA2B,oBAAoB;AAC/E,OAAOC,GAAG,MAOH,KAAK;AAQZ,OAAO,MAAMC,aAAa,CAAC;EACzBC,EAAE;EACFC,IAAI;EACJC,MAAM;EACNC,UAAU;EAEVC,IAAI;EACJC,IAAI;EACJC,KAAK;EACLC,MAAM;EACNC,OAAO;EAEPC,eAAe,GAAG,KAAK;EACvBC,KAAK;EACLC,GAAG;;EAEH;EACAC,UAAU,GAAoBd,GAAG,CAACe,MAAM,CAAC,CAAC;EAC1CC,WAAW,GAAoBhB,GAAG,CAACe,MAAM,CAAC,CAAC;EAE3CE,WAAWA,CACTJ,GAAiB,EACjBK,KAIC,EACD;IACA,IAAI,CAAChB,EAAE,GAAGW,GAAG,CAACX,EAAE;IAChB,IAAI,CAACI,IAAI,GAAGO,GAAG,CAACP,IAAI;IACpB,IAAI,CAACC,IAAI,GAAGM,GAAG,CAACN,IAAI;IACpB,IAAI,CAACC,KAAK,GAAGK,GAAG,CAACL,KAAK;IACtB,IAAI,CAACK,GAAG,GAAGA,GAAG;IAEd,IAAI,QAAQ,IAAIA,GAAG,EAAE;MACnB,IAAI,CAACJ,MAAM,GAAGI,GAAG,CAACJ,MAAM;IAC1B;IAEA,IAAI,SAAS,IAAII,GAAG,EAAE;MACpB,IAAI,CAACH,OAAO,GAAGG,GAAG,CAACH,OAAO;IAC5B;IAEA,IAAI,CAACP,IAAI,GAAGe,KAAK,CAACf,IAAI;IACtB,IAAI,CAACC,MAAM,GAAGc,KAAK,CAACd,MAAM;IAC1B,IAAI,CAACQ,KAAK,GAAGM,KAAK,CAACN,KAAK;EAC1B;EAEA,IAAIO,SAASA,CAAA,EAAG;IACd,MAAM;MAAET,OAAO;MAAEJ;IAAK,CAAC,GAAG,IAAI;IAE9B,MAAMa,SAAoB,GAAG;MAC3BC,UAAU,EAAE,CAAC;IACf,CAAC;IAED,IAAI,CAACV,OAAO,EAAE;MACZ,OAAOS,SAAS;IAClB;IAEA,IAAI,cAAc,IAAIT,OAAO,EAAE;MAC7BS,SAAS,CAACC,UAAU,CAACC,YAAY,GAAGX,OAAO,CAACW,YAAY;IAC1D;IAEA,IAAI,SAAS,IAAIX,OAAO,EAAE;MACxBS,SAAS,CAACG,OAAO,GAAGZ,OAAO,CAACY,OAAO;IACrC;IAEA,IAAI,WAAW,IAAIZ,OAAO,IAAIX,uBAAuB,CAACO,IAAI,CAAC,EAAE;MAC3Da,SAAS,CAACI,SAAS,GAAGb,OAAO,CAACa,SAAS;IACzC;IAEA,OAAOJ,SAAS;EAClB;AACF","ignoreList":[]}

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

@@ -1,6 +1,7 @@
 import joi from 'joi';
 import { isFormState, isFormValue } from "./FormComponent.js";
 import { createComponent } from "./helpers/components.js";
+import { getTranslatedLabel } from "./helpers/index.js";
 import { getErrors } from "../helpers.js";
 import { buildLanguageMessages, validationOptions as opts } from "../pageControllers/validationOptions.js";
 export class ComponentCollection {
@@ -204,20 +205,23 @@ export class ComponentCollection {
           for (const subField of field.collection.fields) {
             const translatedSubLabel = t(subField.title) || subField.label;
             let patchedSchema = subField.formSchema.label(translatedSubLabel);
-            if (messagesOverride) {
-              patchedSchema = patchedSchema.messages(messagesOverride);
+            const subFieldMessages = messagesOverride ? messagesOverride[subField.name] : undefined;
+            if (subFieldMessages) {
+              patchedSchema = patchedSchema.messages(subFieldMessages);
             }
             labelOverrides[subField.name] = patchedSchema;
           }
         } else {
-          const translatedLabel = translator.tComponent(field, 'shortDescription') || translator.tComponent(field, 'title');
+          const fieldDef = field.def;
+          const translatedLabel = getTranslatedLabel(fieldDef, translator);
           const messagesOverride = field.getValidationMessagesOverride(translator);
           let patchedSchema = field.formSchema;
           if (translatedLabel && translatedLabel !== field.label) {
             patchedSchema = patchedSchema.label(translatedLabel);
           }
-          if (messagesOverride) {
-            patchedSchema = patchedSchema.messages(messagesOverride);
+          const fieldMessages = messagesOverride ? messagesOverride[field.name] : undefined;
+          if (fieldMessages) {
+            patchedSchema = patchedSchema.messages(fieldMessages);
           }
           if (patchedSchema !== field.formSchema) {
             labelOverrides[field.name] = patchedSchema;
@@ -235,9 +239,10 @@ export class ComponentCollection {
       })
     });
     const details = result.error?.details;
+    const language = translator?.language;
     return {
       value: result.value ?? {},
-      errors: this.page?.getErrors(details) ?? getErrors(details)
+      errors: this.page?.getErrors(details, language) ?? getErrors(language, details)
     };
   }