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

package/.server/server/plugins/engine/form-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-context.js","names":["Boom","isEqual","PREVIEW_PATH_PREFIX","assertFormAvailable","checkEmailAddressForLiveFormSubmission","getCacheService","FormModel","TerminalPageController","defaultServices","FormStatus","resolveLanguage","getFormModel","slug","state","options","services","formsService","isPreview","isPreviewState","formState","resolveState","metadata","getFormMetadata","definition","getFormDefinition","id","notFound","basePath","buildBasePath","routePrefix","ordnanceSurveyApiKey","formId","controllers","getFormContext","server","yar","Live","formModel","resolveFormModel","cacheService","summaryRequest","app","method","params","path","query","url","URL","cachedState","getState","$$__referenceNumber","language","translator","createTranslator","errors","stateMetadata","models","Map","cache","cacheKey","entry","get","updatedAt","notificationEmail","realm","modifiers","route","prefix","model","set","base","replace","startsWith","slice","getFirstJourneyPage","context","relevantPages","undefined","lastPageReached","at","penultimatePageReached"],"sources":["../../../../src/server/plugins/engine/form-context.ts"],"sourcesContent":["import Boom from '@hapi/boom'\nimport { type Request, type Server } from '@hapi/hapi'\nimport { isEqual } from 'date-fns'\n\nimport { PREVIEW_PATH_PREFIX } from '~/src/server/constants.js'\nimport { assertFormAvailable } from '~/src/server/plugins/engine/form-availability.js'\nimport {\n  checkEmailAddressForLiveFormSubmission,\n  getCacheService\n} from '~/src/server/plugins/engine/helpers.js'\nimport { FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport { type PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'\nimport { TerminalPageController } from '~/src/server/plugins/engine/pageControllers/index.js'\nimport * as defaultServices from '~/src/server/plugins/engine/services/index.js'\nimport {\n  type AnyFormRequest,\n  type AnyRequest,\n  type FormContext,\n  type FormContextRequest,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport { FormStatus } from '~/src/server/routes/types.js'\nimport { type Services } from '~/src/server/types.js'\nimport { resolveLanguage } from '~/src/server/utils/utils.js'\n\ntype JourneyState = FormStatus | 'preview'\n\nexport interface FormModelOptions {\n  services?: Services\n  controllers?: Record<string, typeof PageController>\n  basePath?: string\n  ordnanceSurveyApiKey?: string\n  formId?: string\n  routePrefix?: string\n  isPreview?: boolean\n}\n\nexport interface FormContextOptions extends FormModelOptions {\n  errors?: FormSubmissionError[]\n  language?: string\n}\n\ntype SummaryRequest = FormContextRequest & {\n  yar: Request['yar']\n}\n\nexport async function getFormModel(\n  slug: string,\n  state: JourneyState,\n  options: FormModelOptions = {}\n) {\n  const services = options.services ?? defaultServices\n  const { formsService } = services\n  const isPreview = isPreviewState(state, options)\n  const formState = resolveState(state)\n\n  const metadata = await formsService.getFormMetadata(slug)\n  assertFormAvailable(metadata, formState, isPreview)\n\n  const definition = await formsService.getFormDefinition(\n    metadata.id,\n    formState\n  )\n\n  if (!definition) {\n    throw Boom.notFound(\n      `No definition found for form metadata ${metadata.id} (${slug}) ${state}`\n    )\n  }\n\n  return new FormModel(\n    definition,\n    {\n      basePath:\n        options.basePath ??\n        buildBasePath(options.routePrefix ?? '', slug, formState, isPreview),\n      ordnanceSurveyApiKey: options.ordnanceSurveyApiKey,\n      formId: options.formId ?? metadata.id\n    },\n    services,\n    options.controllers\n  )\n}\n\nexport async function getFormContext(\n  { server, yar }: Pick<Request, 'server' | 'yar'>,\n  slug: string,\n  state: JourneyState = FormStatus.Live,\n  options: FormContextOptions = {}\n): Promise<FormContext> {\n  const formModel = await resolveFormModel(server, slug, state, options)\n\n  const cacheService = getCacheService(server)\n\n  const summaryRequest: SummaryRequest = {\n    app: {},\n    method: 'get',\n    params: {\n      path: 'summary',\n      slug,\n      ...(isPreviewState(state, options) && {\n        state: resolveState(state)\n      })\n    },\n    path: `/${formModel.basePath}/summary`,\n    query: {},\n    url: new URL(\n      `/${formModel.basePath}/summary`,\n      'https://form-context.local'\n    ),\n    server,\n    yar\n  }\n\n  const cachedState = await cacheService.getState(\n    summaryRequest as unknown as AnyRequest\n  )\n\n  const formState = {\n    ...cachedState,\n    $$__referenceNumber: cachedState.$$__referenceNumber\n  } as unknown as FormSubmissionState\n\n  const language = resolveLanguage(summaryRequest as unknown as AnyFormRequest)\n  const translator = formModel.createTranslator(language)\n\n  return formModel.getFormContext(\n    summaryRequest,\n    formState,\n    options.errors ?? [],\n    translator\n  )\n}\n\nexport async function resolveFormModel(\n  server: Server,\n  slug: string,\n  state: JourneyState,\n  options: FormModelOptions = {}\n) {\n  const services = options.services ?? defaultServices\n  const { formsService } = services\n\n  const metadata = await formsService.getFormMetadata(slug)\n  const formState = resolveState(state)\n  const isPreview = options.isPreview ?? isPreviewState(state, options)\n  assertFormAvailable(metadata, formState, isPreview)\n  const stateMetadata = metadata[formState]\n\n  if (!stateMetadata) {\n    throw Boom.notFound(\n      `No '${formState}' state for form metadata ${metadata.id}`\n    )\n  }\n\n  // The models cache is created lazily per server instance\n  server.app.models ??= new Map<string, { model: FormModel; updatedAt: Date }>()\n\n  const cache = server.app.models\n\n  const cacheKey = `${metadata.id}_${formState}_${isPreview}`\n  let entry = cache.get(cacheKey)\n\n  if (!entry || !isEqual(entry.updatedAt, stateMetadata.updatedAt)) {\n    const definition = await formsService.getFormDefinition(\n      metadata.id,\n      formState\n    )\n\n    if (!definition) {\n      throw Boom.notFound(\n        `No definition found for form metadata ${metadata.id} (${slug}) ${state}`\n      )\n    }\n\n    checkEmailAddressForLiveFormSubmission(\n      metadata.notificationEmail,\n      isPreview\n    )\n\n    const routePrefix =\n      options.routePrefix ?? server.realm.modifiers.route.prefix\n\n    const model = new FormModel(\n      definition,\n      {\n        basePath:\n          options.basePath ??\n          buildBasePath(routePrefix, slug, formState, isPreview),\n        ordnanceSurveyApiKey: options.ordnanceSurveyApiKey,\n        formId: options.formId ?? metadata.id\n      },\n      services,\n      options.controllers\n    )\n\n    entry = { model, updatedAt: stateMetadata.updatedAt }\n    cache.set(cacheKey, entry)\n  }\n\n  return entry.model\n}\n\nfunction buildBasePath(\n  routePrefix: string,\n  slug: string,\n  state: FormStatus,\n  isPreview: boolean\n) {\n  const base = (\n    isPreview\n      ? `${routePrefix}${PREVIEW_PATH_PREFIX}/${state}/${slug}`\n      : `${routePrefix}/${slug}`\n  ).replace(/\\/{2,}/g, '/')\n\n  return base.startsWith('/') ? base.slice(1) : base\n}\n\nexport function getFirstJourneyPage(\n  context?: Pick<FormContext, 'relevantPages'>\n) {\n  if (!context?.relevantPages) {\n    return undefined\n  }\n\n  const lastPageReached = context.relevantPages.at(-1)\n  const penultimatePageReached = context.relevantPages.at(-2)\n\n  if (\n    lastPageReached instanceof TerminalPageController &&\n    penultimatePageReached\n  ) {\n    return penultimatePageReached\n  }\n\n  return lastPageReached\n}\n\nfunction resolveState(state: JourneyState): FormStatus {\n  return state === 'preview' ? FormStatus.Live : state\n}\n\nfunction isPreviewState(\n  state: JourneyState,\n  options: FormModelOptions = {}\n): boolean {\n  return options.isPreview ?? state === 'preview'\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"form-context.js","names":["Boom","isEqual","PREVIEW_PATH_PREFIX","assertFormAvailable","checkEmailAddressForLiveFormSubmission","getCacheService","FormModel","TerminalPageController","defaultServices","FormStatus","resolveLanguage","getFormModel","slug","state","options","services","formsService","isPreview","isPreviewState","formState","resolveState","metadata","getFormMetadata","definition","getFormDefinition","id","notFound","basePath","buildBasePath","routePrefix","ordnanceSurveyApiKey","formId","controllers","getFormContext","server","yar","Live","formModel","resolveFormModel","cacheService","summaryRequest","app","method","params","path","query","url","URL","cachedState","getState","$$__referenceNumber","language","translator","createTranslator","errors","stateMetadata","models","Map","cache","cacheKey","entry","get","updatedAt","notificationEmail","realm","modifiers","route","prefix","model","set","def","base","replace","startsWith","slice","getFirstJourneyPage","context","relevantPages","undefined","lastPageReached","at","penultimatePageReached"],"sources":["../../../../src/server/plugins/engine/form-context.ts"],"sourcesContent":["import Boom from '@hapi/boom'\nimport { type Request, type Server } from '@hapi/hapi'\nimport { isEqual } from 'date-fns'\n\nimport { PREVIEW_PATH_PREFIX } from '~/src/server/constants.js'\nimport { assertFormAvailable } from '~/src/server/plugins/engine/form-availability.js'\nimport {\n  checkEmailAddressForLiveFormSubmission,\n  getCacheService\n} from '~/src/server/plugins/engine/helpers.js'\nimport { FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport { type PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'\nimport { TerminalPageController } from '~/src/server/plugins/engine/pageControllers/index.js'\nimport * as defaultServices from '~/src/server/plugins/engine/services/index.js'\nimport {\n  type AnyFormRequest,\n  type AnyRequest,\n  type FormContext,\n  type FormContextRequest,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport { FormStatus } from '~/src/server/routes/types.js'\nimport { type Services } from '~/src/server/types.js'\nimport { resolveLanguage } from '~/src/server/utils/utils.js'\n\ntype JourneyState = FormStatus | 'preview'\n\nexport interface FormModelOptions {\n  services?: Services\n  controllers?: Record<string, typeof PageController>\n  basePath?: string\n  ordnanceSurveyApiKey?: string\n  formId?: string\n  routePrefix?: string\n  isPreview?: boolean\n}\n\nexport interface FormContextOptions extends FormModelOptions {\n  errors?: FormSubmissionError[]\n  language?: string\n}\n\ntype SummaryRequest = FormContextRequest & {\n  yar: Request['yar']\n}\n\nexport async function getFormModel(\n  slug: string,\n  state: JourneyState,\n  options: FormModelOptions = {}\n) {\n  const services = options.services ?? defaultServices\n  const { formsService } = services\n  const isPreview = isPreviewState(state, options)\n  const formState = resolveState(state)\n\n  const metadata = await formsService.getFormMetadata(slug)\n\n  const definition = await formsService.getFormDefinition(\n    metadata.id,\n    formState\n  )\n\n  assertFormAvailable(metadata, definition, formState, isPreview)\n\n  if (!definition) {\n    throw Boom.notFound(\n      `No definition found for form metadata ${metadata.id} (${slug}) ${state}`\n    )\n  }\n\n  return new FormModel(\n    definition,\n    {\n      basePath:\n        options.basePath ??\n        buildBasePath(options.routePrefix ?? '', slug, formState, isPreview),\n      ordnanceSurveyApiKey: options.ordnanceSurveyApiKey,\n      formId: options.formId ?? metadata.id\n    },\n    services,\n    options.controllers\n  )\n}\n\nexport async function getFormContext(\n  { server, yar }: Pick<Request, 'server' | 'yar'>,\n  slug: string,\n  state: JourneyState = FormStatus.Live,\n  options: FormContextOptions = {}\n): Promise<FormContext> {\n  const formModel = await resolveFormModel(server, slug, state, options)\n\n  const cacheService = getCacheService(server)\n\n  const summaryRequest: SummaryRequest = {\n    app: {},\n    method: 'get',\n    params: {\n      path: 'summary',\n      slug,\n      ...(isPreviewState(state, options) && {\n        state: resolveState(state)\n      })\n    },\n    path: `/${formModel.basePath}/summary`,\n    query: {},\n    url: new URL(\n      `/${formModel.basePath}/summary`,\n      'https://form-context.local'\n    ),\n    server,\n    yar\n  }\n\n  const cachedState = await cacheService.getState(\n    summaryRequest as unknown as AnyRequest\n  )\n\n  const formState = {\n    ...cachedState,\n    $$__referenceNumber: cachedState.$$__referenceNumber\n  } as unknown as FormSubmissionState\n\n  const language = resolveLanguage(summaryRequest as unknown as AnyFormRequest)\n  const translator = formModel.createTranslator(language)\n\n  return formModel.getFormContext(\n    summaryRequest,\n    formState,\n    options.errors ?? [],\n    translator\n  )\n}\n\nexport async function resolveFormModel(\n  server: Server,\n  slug: string,\n  state: JourneyState,\n  options: FormModelOptions = {}\n) {\n  const services = options.services ?? defaultServices\n  const { formsService } = services\n\n  const metadata = await formsService.getFormMetadata(slug)\n  const formState = resolveState(state)\n  const isPreview = options.isPreview ?? isPreviewState(state, options)\n  const stateMetadata = metadata[formState]\n\n  if (!stateMetadata) {\n    throw Boom.notFound(\n      `No '${formState}' state for form metadata ${metadata.id}`\n    )\n  }\n\n  // The models cache is created lazily per server instance\n  server.app.models ??= new Map<string, { model: FormModel; updatedAt: Date }>()\n\n  const cache = server.app.models\n\n  const cacheKey = `${metadata.id}_${formState}_${isPreview}`\n  let entry = cache.get(cacheKey)\n\n  if (!entry || !isEqual(entry.updatedAt, stateMetadata.updatedAt)) {\n    const definition = await formsService.getFormDefinition(\n      metadata.id,\n      formState\n    )\n\n    if (!definition) {\n      throw Boom.notFound(\n        `No definition found for form metadata ${metadata.id} (${slug}) ${state}`\n      )\n    }\n\n    checkEmailAddressForLiveFormSubmission(\n      metadata.notificationEmail,\n      isPreview\n    )\n\n    const routePrefix =\n      options.routePrefix ?? server.realm.modifiers.route.prefix\n\n    const model = new FormModel(\n      definition,\n      {\n        basePath:\n          options.basePath ??\n          buildBasePath(routePrefix, slug, formState, isPreview),\n        ordnanceSurveyApiKey: options.ordnanceSurveyApiKey,\n        formId: options.formId ?? metadata.id\n      },\n      services,\n      options.controllers\n    )\n\n    entry = { model, updatedAt: stateMetadata.updatedAt }\n    cache.set(cacheKey, entry)\n  }\n\n  assertFormAvailable(metadata, entry.model.def, formState, isPreview)\n\n  return entry.model\n}\n\nfunction buildBasePath(\n  routePrefix: string,\n  slug: string,\n  state: FormStatus,\n  isPreview: boolean\n) {\n  const base = (\n    isPreview\n      ? `${routePrefix}${PREVIEW_PATH_PREFIX}/${state}/${slug}`\n      : `${routePrefix}/${slug}`\n  ).replace(/\\/{2,}/g, '/')\n\n  return base.startsWith('/') ? base.slice(1) : base\n}\n\nexport function getFirstJourneyPage(\n  context?: Pick<FormContext, 'relevantPages'>\n) {\n  if (!context?.relevantPages) {\n    return undefined\n  }\n\n  const lastPageReached = context.relevantPages.at(-1)\n  const penultimatePageReached = context.relevantPages.at(-2)\n\n  if (\n    lastPageReached instanceof TerminalPageController &&\n    penultimatePageReached\n  ) {\n    return penultimatePageReached\n  }\n\n  return lastPageReached\n}\n\nfunction resolveState(state: JourneyState): FormStatus {\n  return state === 'preview' ? FormStatus.Live : state\n}\n\nfunction isPreviewState(\n  state: JourneyState,\n  options: FormModelOptions = {}\n): boolean {\n  return options.isPreview ?? state === 'preview'\n}\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/engine/i18n/buildValidationMessages.d.ts

@@ -7,7 +7,7 @@ import { type JoiExpression } from 'joi';
  * because Joi cannot resolve custom functions from a plain string.
  * Plain strings with only built-in tokens ({{#label}}, {{#limit}}) work without wrapping.
  */
-export declare function buildValidationMessages(t: (key: string) => string): {
+export declare function buildValidationMessages(t: (key: string, options?: Record<string, unknown>) => string): {
     required: JoiExpression;
     selectRequired: JoiExpression;
     pattern: JoiExpression;

package/.server/server/plugins/engine/i18n/buildValidationMessages.js

@@ -39,15 +39,36 @@ export function buildValidationMessages(t) {
     dateMin: t('components.dateField.validation.dateMin'),
     dateMax: t('components.dateField.validation.dateMax'),
     unicode: t('validation.unicode'),
-    arrayMin: t('validation.arrayMin'),
-    arrayMax: t('validation.arrayMax'),
-    arrayLength: t('validation.arrayLength'),
-    featuresMin: t('validation.featuresMin'),
-    featuresMax: t('validation.featuresMax'),
-    featuresLength: t('validation.featuresLength'),
-    filesMin: t('validation.filesMin'),
-    filesMax: t('validation.filesMax'),
-    filesLength: t('validation.filesLength')
+    // These generic templates are shared across fields with differing limits, so a
+    // fixed singular count is used here — components needing accurate singular/plural
+    // text (e.g. FileUploadField) build their own per-instance messages instead.
+    arrayMin: t('validation.arrayMin', {
+      count: 1
+    }),
+    arrayMax: t('validation.arrayMax', {
+      count: 1
+    }),
+    arrayLength: t('validation.arrayLength', {
+      count: 1
+    }),
+    featuresMin: t('validation.featuresMin', {
+      count: 1
+    }),
+    featuresMax: t('validation.featuresMax', {
+      count: 1
+    }),
+    featuresLength: t('validation.featuresLength', {
+      count: 1
+    }),
+    filesMin: t('validation.filesMin', {
+      count: 1
+    }),
+    filesMax: t('validation.filesMax', {
+      count: 1
+    }),
+    filesLength: t('validation.filesLength', {
+      count: 1
+    })
   };
 }
 //# sourceMappingURL=buildValidationMessages.js.map

package/.server/server/plugins/engine/i18n/buildValidationMessages.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildValidationMessages.js","names":["joi","lowerFirstPreserveProperNouns","opts","functions","lowerFirst","buildValidationMessages","t","required","expression","selectRequired","pattern","format","declarationRequired","objectRequired","objectMissing","selectYesNoRequired","max","min","minMax","number","numberPrecision","numberInteger","numberMin","numberMax","maxWords","dateFormat","dateMin","dateMax","unicode","arrayMin","arrayMax","arrayLength","featuresMin","featuresMax","featuresLength","filesMin","filesMax","filesLength"],"sources":["../../../../../src/server/plugins/engine/i18n/buildValidationMessages.ts"],"sourcesContent":["import joi, { type JoiExpression, type ReferenceOptions } from 'joi'\n\nimport { lowerFirstPreserveProperNouns } from '~/src/server/plugins/engine/components/helpers/index.js'\n\nconst opts = {\n  functions: {\n    lowerFirst: lowerFirstPreserveProperNouns\n  }\n} as ReferenceOptions\n\n/**\n * Builds a set of translated Joi message templates for a given language.\n * Called once per FormModel at construction time.\n *\n * Strings containing {{lowerFirst(#label)}} must be wrapped in joi.expression()\n * because Joi cannot resolve custom functions from a plain string.\n * Plain strings with only built-in tokens ({{#label}}, {{#limit}}) work without wrapping.\n */\nexport function buildValidationMessages(t: (key: string) => string) {\n  return {\n    // Expressions — contain lowerFirst custom function\n    required: joi.expression(t('validation.required'), opts) as JoiExpression,\n    selectRequired: joi.expression(\n      t('validation.selectRequired'),\n      opts\n    ) as JoiExpression,\n    pattern: joi.expression(t('validation.pattern'), opts) as JoiExpression,\n    format: joi.expression(t('validation.format'), opts) as JoiExpression,\n    declarationRequired: joi.expression(\n      t('components.declarationField.validation.declarationRequired'),\n      opts\n    ) as JoiExpression,\n    objectRequired: joi.expression(\n      t('validation.objectRequired'),\n      opts\n    ) as JoiExpression,\n    objectMissing: joi.expression(\n      t('validation.objectMissing'),\n      opts\n    ) as JoiExpression,\n\n    // Plain Joi template strings — no lowerFirst\n    selectYesNoRequired: t(\n      'components.yesNoField.validation.selectYesNoRequired'\n    ),\n    max: t('validation.max'),\n    min: t('validation.min'),\n    minMax: t('validation.minMax'),\n    number: t('validation.number'),\n    numberPrecision: t('validation.numberPrecision'),\n    numberInteger: t('validation.numberInteger'),\n    numberMin: t('validation.numberMin'),\n    numberMax: t('validation.numberMax'),\n    maxWords: t('validation.maxWords'),\n    dateFormat: t('components.dateField.validation.dateFormat'),\n    dateMin: t('components.dateField.validation.dateMin'),\n    dateMax: t('components.dateField.validation.dateMax'),\n\n    unicode: t('validation.unicode'),\n    arrayMin: t('validation.arrayMin'),\n    arrayMax: t('validation.arrayMax'),\n    arrayLength: t('validation.arrayLength'),\n    featuresMin: t('validation.featuresMin'),\n    featuresMax: t('validation.featuresMax'),\n    featuresLength: t('validation.featuresLength'),\n    filesMin: t('validation.filesMin'),\n    filesMax: t('validation.filesMax'),\n    filesLength: t('validation.filesLength')\n  }\n}\n\nexport type ValidationMessages = ReturnType<typeof buildValidationMessages>\n"],"mappings":"AAAA,OAAOA,GAAG,MAAqD,KAAK;AAEpE,SAASC,6BAA6B;AAEtC,MAAMC,IAAI,GAAG;EACXC,SAAS,EAAE;IACTC,UAAU,EAAEH;EACd;AACF,CAAqB;;AAErB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,uBAAuBA,CAACC,CAA0B,EAAE;EAClE,OAAO;IACL;IACAC,QAAQ,EAAEP,GAAG,CAACQ,UAAU,CAACF,CAAC,CAAC,qBAAqB,CAAC,EAAEJ,IAAI,CAAkB;IACzEO,cAAc,EAAET,GAAG,CAACQ,UAAU,CAC5BF,CAAC,CAAC,2BAA2B,CAAC,EAC9BJ,IACF,CAAkB;IAClBQ,OAAO,EAAEV,GAAG,CAACQ,UAAU,CAACF,CAAC,CAAC,oBAAoB,CAAC,EAAEJ,IAAI,CAAkB;IACvES,MAAM,EAAEX,GAAG,CAACQ,UAAU,CAACF,CAAC,CAAC,mBAAmB,CAAC,EAAEJ,IAAI,CAAkB;IACrEU,mBAAmB,EAAEZ,GAAG,CAACQ,UAAU,CACjCF,CAAC,CAAC,4DAA4D,CAAC,EAC/DJ,IACF,CAAkB;IAClBW,cAAc,EAAEb,GAAG,CAACQ,UAAU,CAC5BF,CAAC,CAAC,2BAA2B,CAAC,EAC9BJ,IACF,CAAkB;IAClBY,aAAa,EAAEd,GAAG,CAACQ,UAAU,CAC3BF,CAAC,CAAC,0BAA0B,CAAC,EAC7BJ,IACF,CAAkB;IAElB;IACAa,mBAAmB,EAAET,CAAC,CACpB,sDACF,CAAC;IACDU,GAAG,EAAEV,CAAC,CAAC,gBAAgB,CAAC;IACxBW,GAAG,EAAEX,CAAC,CAAC,gBAAgB,CAAC;IACxBY,MAAM,EAAEZ,CAAC,CAAC,mBAAmB,CAAC;IAC9Ba,MAAM,EAAEb,CAAC,CAAC,mBAAmB,CAAC;IAC9Bc,eAAe,EAAEd,CAAC,CAAC,4BAA4B,CAAC;IAChDe,aAAa,EAAEf,CAAC,CAAC,0BAA0B,CAAC;IAC5CgB,SAAS,EAAEhB,CAAC,CAAC,sBAAsB,CAAC;IACpCiB,SAAS,EAAEjB,CAAC,CAAC,sBAAsB,CAAC;IACpCkB,QAAQ,EAAElB,CAAC,CAAC,qBAAqB,CAAC;IAClCmB,UAAU,EAAEnB,CAAC,CAAC,4CAA4C,CAAC;IAC3DoB,OAAO,EAAEpB,CAAC,CAAC,yCAAyC,CAAC;IACrDqB,OAAO,EAAErB,CAAC,CAAC,yCAAyC,CAAC;IAErDsB,OAAO,EAAEtB,CAAC,CAAC,oBAAoB,CAAC;IAChCuB,QAAQ,EAAEvB,CAAC,CAAC,qBAAqB,CAAC;IAClCwB,QAAQ,EAAExB,CAAC,CAAC,qBAAqB,CAAC;IAClCyB,WAAW,EAAEzB,CAAC,CAAC,wBAAwB,CAAC;IACxC0B,WAAW,EAAE1B,CAAC,CAAC,wBAAwB,CAAC;IACxC2B,WAAW,EAAE3B,CAAC,CAAC,wBAAwB,CAAC;IACxC4B,cAAc,EAAE5B,CAAC,CAAC,2BAA2B,CAAC;IAC9C6B,QAAQ,EAAE7B,CAAC,CAAC,qBAAqB,CAAC;IAClC8B,QAAQ,EAAE9B,CAAC,CAAC,qBAAqB,CAAC;IAClC+B,WAAW,EAAE/B,CAAC,CAAC,wBAAwB;EACzC,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"buildValidationMessages.js","names":["joi","lowerFirstPreserveProperNouns","opts","functions","lowerFirst","buildValidationMessages","t","required","expression","selectRequired","pattern","format","declarationRequired","objectRequired","objectMissing","selectYesNoRequired","max","min","minMax","number","numberPrecision","numberInteger","numberMin","numberMax","maxWords","dateFormat","dateMin","dateMax","unicode","arrayMin","count","arrayMax","arrayLength","featuresMin","featuresMax","featuresLength","filesMin","filesMax","filesLength"],"sources":["../../../../../src/server/plugins/engine/i18n/buildValidationMessages.ts"],"sourcesContent":["import joi, { type JoiExpression, type ReferenceOptions } from 'joi'\n\nimport { lowerFirstPreserveProperNouns } from '~/src/server/plugins/engine/components/helpers/index.js'\n\nconst opts = {\n  functions: {\n    lowerFirst: lowerFirstPreserveProperNouns\n  }\n} as ReferenceOptions\n\n/**\n * Builds a set of translated Joi message templates for a given language.\n * Called once per FormModel at construction time.\n *\n * Strings containing {{lowerFirst(#label)}} must be wrapped in joi.expression()\n * because Joi cannot resolve custom functions from a plain string.\n * Plain strings with only built-in tokens ({{#label}}, {{#limit}}) work without wrapping.\n */\nexport function buildValidationMessages(\n  t: (key: string, options?: Record<string, unknown>) => string\n) {\n  return {\n    // Expressions — contain lowerFirst custom function\n    required: joi.expression(t('validation.required'), opts) as JoiExpression,\n    selectRequired: joi.expression(\n      t('validation.selectRequired'),\n      opts\n    ) as JoiExpression,\n    pattern: joi.expression(t('validation.pattern'), opts) as JoiExpression,\n    format: joi.expression(t('validation.format'), opts) as JoiExpression,\n    declarationRequired: joi.expression(\n      t('components.declarationField.validation.declarationRequired'),\n      opts\n    ) as JoiExpression,\n    objectRequired: joi.expression(\n      t('validation.objectRequired'),\n      opts\n    ) as JoiExpression,\n    objectMissing: joi.expression(\n      t('validation.objectMissing'),\n      opts\n    ) as JoiExpression,\n\n    // Plain Joi template strings — no lowerFirst\n    selectYesNoRequired: t(\n      'components.yesNoField.validation.selectYesNoRequired'\n    ),\n    max: t('validation.max'),\n    min: t('validation.min'),\n    minMax: t('validation.minMax'),\n    number: t('validation.number'),\n    numberPrecision: t('validation.numberPrecision'),\n    numberInteger: t('validation.numberInteger'),\n    numberMin: t('validation.numberMin'),\n    numberMax: t('validation.numberMax'),\n    maxWords: t('validation.maxWords'),\n    dateFormat: t('components.dateField.validation.dateFormat'),\n    dateMin: t('components.dateField.validation.dateMin'),\n    dateMax: t('components.dateField.validation.dateMax'),\n\n    unicode: t('validation.unicode'),\n    // These generic templates are shared across fields with differing limits, so a\n    // fixed singular count is used here — components needing accurate singular/plural\n    // text (e.g. FileUploadField) build their own per-instance messages instead.\n    arrayMin: t('validation.arrayMin', { count: 1 }),\n    arrayMax: t('validation.arrayMax', { count: 1 }),\n    arrayLength: t('validation.arrayLength', { count: 1 }),\n    featuresMin: t('validation.featuresMin', { count: 1 }),\n    featuresMax: t('validation.featuresMax', { count: 1 }),\n    featuresLength: t('validation.featuresLength', { count: 1 }),\n    filesMin: t('validation.filesMin', { count: 1 }),\n    filesMax: t('validation.filesMax', { count: 1 }),\n    filesLength: t('validation.filesLength', { count: 1 })\n  }\n}\n\nexport type ValidationMessages = ReturnType<typeof buildValidationMessages>\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/engine/i18n/translations/cy.json

@@ -16,15 +16,61 @@
     "numberMax": "Rhaid i {{#label}} fod yn {{#limit}} neu is",
     "maxWords": "Rhaid i {{#label}} fod yn {{#limit}} o eiriau neu lai",
     "unicode": "Mae {{#label}} yn cynnwys nodau annilys, er enghraifft, dashes hirion",
-    "arrayMin": "Dewiswch o leiaf {{#limit}} o opsiynau o'r rhestr",
-    "arrayMax": "Dim ond {{#limit}} y gellir eu dewis o'r rhestr",
-    "arrayLength": "Dewiswch ddim ond {{#limit}} o opsiynau o'r rhestr",
-    "featuresMin": "Diffiniwch o leiaf {{#limit}} nodwedd",
-    "featuresMax": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
-    "featuresLength": "Diffiniwch nodweddion {{#limit}} yn union",
-    "filesMin": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
-    "filesMax": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
-    "filesLength": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau"
+    "arrayMin_zero": "Dewiswch o leiaf 1 opsiwn o'r rhestr",
+    "arrayMin_one": "Dewiswch o leiaf {{#limit}} opsiwn o'r rhestr",
+    "arrayMin_two": "Dewiswch o leiaf ddau opsiwn o'r rhestr",
+    "arrayMin_few": "Dewiswch o leiaf {{#limit}} opsiwn o'r rhestr",
+    "arrayMin_many": "Dewiswch o leiaf {{#limit}} opsiwn o'r rhestr",
+    "arrayMin_other": "Dewiswch o leiaf {{#limit}} opsiwn o'r rhestr",
+    "arrayMax_zero": "Dim ond {{#limit}} opsiynau y gellir eu dewis o'r rhestr",
+    "arrayMax_one": "Dim ond {{#limit}} opsiwn y gellir ei ddewis o'r rhestr",
+    "arrayMax_two": "Dim ond dwy opsiwn y gellir eu dewis o'r rhestr",
+    "arrayMax_few": "Dim ond {{#limit}} opsiwn y gellir eu dewis o'r rhestr",
+    "arrayMax_many": "Dim ond {{#limit}} opsiwn y gellir eu dewis o'r rhestr",
+    "arrayMax_other": "Dim ond {{#limit}} opsiwn y gellir eu dewis o'r rhestr",
+    "arrayLength_zero": "Dewiswch 0 opsiwn yn unig o'r rhestr",
+    "arrayLength_one": "Dewiswch un opsiwn yn unig o'r rhestr",
+    "arrayLength_two": "Dewiswch {{#limit}} opsiwn yn unig o'r rhestr",
+    "arrayLength_few": "Dewiswch {{#limit}} opsiwn yn unig o'r rhestr",
+    "arrayLength_many": "Dewiswch {{#limit}} opsiwn yn unig o'r rhestr",
+    "arrayLength_other": "Dewiswch {{#limit}} opsiwn yn unig o'r rhestr",
+
+    "featuresMin_zero": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMin_one": "Diffiniwch o leiaf un nodwedd",
+    "featuresMin_two": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMin_few": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMin_many": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMin_other": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMax_zero": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresMax_one": "Dim ond {{#limit}} nodwedd y gellir ei diffinio",
+    "featuresMax_two": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresMax_few": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresMax_many": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresMax_other": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresLength_zero": "Diffiniwch yn union {{#limit}} nodwedd",
+    "featuresLength_one": "Diffiniwch un nodwedd yn union",
+    "featuresLength_two": "Diffiniwch nodweddion {{#limit}} yn union",
+    "featuresLength_few": "Diffiniwch nodweddion {{#limit}} yn union",
+    "featuresLength_many": "Diffiniwch nodweddion {{#limit}} yn union",
+    "featuresLength_other": "Diffiniwch nodweddion {{#limit}} yn union",
+    "filesMin_zero": "Rhaid i chi uwchlwytho {{#limit}} ffeil neu fwy",
+    "filesMin_one": "Rhaid i chi uwchlwytho un ffeil neu fwy",
+    "filesMin_two": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMin_few": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMin_many": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMin_other": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMax_zero": "Dim ond {{#limit}} ffeil neu lai y gallwch eu huwchlwytho",
+    "filesMax_one": "Dim ond un ffeil neu lai y gallwch ei huwchlwytho",
+    "filesMax_two": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesMax_few": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesMax_many": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesMax_other": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesLength_zero": "Rhaid i chi uwchlwytho union {{#limit}} ffeil",
+    "filesLength_one": "Rhaid i chi uwchlwytho union un ffeil",
+    "filesLength_two": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau",
+    "filesLength_few": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau",
+    "filesLength_many": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau",
+    "filesLength_other": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau"
   },
 
   "errors": {
@@ -44,7 +90,7 @@
     "and": "a",
     "england": "Lloegr",
     "wales": "Cymru",
-    "northernIreland": "Gogledd Iwerddon",
+    "northern-ireland": "Gogledd Iwerddon",
     "scotland": "Yr Alban",
     "sendFeedback": "Anfon adborth"
   },
@@ -161,6 +207,16 @@
       "bannerForce": "Rhagolwg o ffurflen [[previewMode]] yw hon. Peidiwch â rhoi gwybodaeth bersonol.",
       "bannerText": "Dyma ragolwg o dudalen ffurflen [[previewMode]] rydych chi'n ei golygu.",
       "previousPages": "Mae'n dibynnu ar atebion o dudalennau cynharach yn y ffurflen. Yn y fersiwn fyw, bydd angen i ddefnyddwyr gwblhau'r cwestiynau hynny yn gyntaf."
+    },
+
+    "formUnavailable": {
+      "title": "Mae'n ddrwg gennyf, nid yw'r ffurflen hon ar gael",
+      "subHeading": "Nid yw '[[formTitle]]' ar gael mwyach.",
+      "contactDetailsHeading": "Manylion cyswllt ar gyfer [[organisationName]]",
+      "telephone": "Ffôn",
+      "callCharges": "Dysgwch am gostau galwadau",
+      "email": "E-bost",
+      "onlineContactForm": "Ffurflen gyswllt ar-lein"
     }
   },
 
@@ -267,7 +323,16 @@
     },
 
     "locationFieldBase": {
-      "howToFind": "Sut i ddod o hyd i fanylion lleoliad"
+      "howToFind": "Sut i ddod o hyd i fanylion lleoliad",
+      "map": {
+        "helpPanel": {
+          "label": "Sut i ddefnyddio'r map hwn",
+          "point1": "Chwilio am sir, lle neu god post",
+          "point2": "Defnyddiwch yr eiconau + a - i chwyddo i mewn ac allan",
+          "point3": "Defnyddiwch lyfliwr neu allweddlon i ganolbwyntio'r pwynt yn y lleoliad",
+          "point4": "Cliciwch i ychwanegu'r lleoliad i'r map"
+        }
+      }
     },
 
     "yesNoField": {
@@ -294,6 +359,47 @@
       "added_few": "Ychwanegwyd [[count]] lleoliad",
       "added_many": "Ychwanegwyd [[count]] o leoliadau",
       "added_other": "Ychwanegwyd [[count]] lleoliad",
+      "map": {
+        "helpPanel": {
+          "label": "Sut i ddefnyddio'r map hwn",
+          "ledeIntro": "Gallwch ychwanegu",
+          "ledeOutro": "i'r map.",
+          "lineText": "llinell",
+          "shapeText": "siâp",
+          "lineOrShapeText": "llinell neu siâp",
+          "typesPhrasePoint": "pwyntiau",
+          "typesPhraseLine": "lliniau",
+          "typesPhraseShape": "siâpiau",
+          "typesPhraseOr": "neu",
+          "point1": "Chwilio am sir, lle neu god post",
+          "point2": "Defnyddiwch yr eiconau + a - i chwyddo i mewn ac allan",
+          "point3": "Cliciwch ddwywaith, neu dewiswch 'Wedi gorffen', pan fyddwch wedi",
+          "point4": "Rhowch enw i'r lleoliad"
+        },
+        "typeDescriptions": {
+          "point": "Pwynt",
+          "line": "Llinell",
+          "polygon": "Siâp"
+        },
+        "buttons": {
+          "point": "Ychwanegu pwynt",
+          "line": "Ychwanegu llinell",
+          "polygon": "Ychwanegu siâp"
+        },
+        "itemLabel1": "Lleoliad",
+        "itemLabel2": "disgrifiad",
+        "itemUpdateLink": "Diweddaru",
+        "itemDeleteLink": "Dileu",
+        "itemFocusLink": "Dangos",
+        "itemVisuallyHidden": "lleoliad",
+        "details": {
+          "summary": "Cyfesurynnau",
+          "type": "Math",
+          "centroidGridReference": "Canol cyfeirnod grid",
+          "firstPointGridReference": "Cyfeirnod grid y pwynt cyntaf",
+          "detailedCoordinates": "Cyfesurynnau manwl"
+        }
+      },
       "validation": {
         "descriptionRequired": "Rhowch ddisgrifiad ar gyfer lleoliad [[count]]",
         "wrongCountry": "Rhaid i leoliad [[count]] fod y tu mewn i [[country]]"

package/.server/server/plugins/engine/i18n/translations/en-GB.json

@@ -16,15 +16,24 @@
     "numberMax": "{{#label}} must be {{#limit}} or lower",
     "maxWords": "{{#label}} must be {{#limit}} words or fewer",
     "unicode": "{{#label}} includes invalid characters, for example, long dashes",
-    "arrayMin": "Select at least {{#limit}} options from the list",
-    "arrayMax": "Only {{#limit}} can be selected from the list",
-    "arrayLength": "Select only {{#limit}} options from the list",
-    "featuresMin": "Define at least {{#limit}} features",
-    "featuresMax": "Only {{#limit}} features can be defined",
-    "featuresLength": "Define exactly {{#limit}} features",
-    "filesMin": "You must upload {{#limit}} files or more",
-    "filesMax": "You can only upload {{#limit}} files or less",
-    "filesLength": "You must upload exactly {{#limit}} files"
+    "arrayMin_one": "Select at least {{#limit}} option from the list",
+    "arrayMin_other": "Select at least {{#limit}} options from the list",
+    "arrayMax_one": "Only {{#limit}} option can be selected from the list",
+    "arrayMax_other": "Only {{#limit}} options can be selected from the list",
+    "arrayLength_one": "Select only {{#limit}} option from the list",
+    "arrayLength_other": "Select only {{#limit}} options from the list",
+    "featuresMin_one": "Define at least {{#limit}} feature",
+    "featuresMin_other": "Define at least {{#limit}} features",
+    "featuresMax_one": "Only {{#limit}} feature can be defined",
+    "featuresMax_other": "Only {{#limit}} features can be defined",
+    "featuresLength_one": "Define exactly {{#limit}} feature",
+    "featuresLength_other": "Define exactly {{#limit}} features",
+    "filesMin_one": "You must upload {{#limit}} file or more",
+    "filesMin_other": "You must upload {{#limit}} files or more",
+    "filesMax_one": "You can only upload {{#limit}} file or less",
+    "filesMax_other": "You can only upload {{#limit}} files or less",
+    "filesLength_one": "You must upload exactly {{#limit}} file",
+    "filesLength_other": "You must upload exactly {{#limit}} files"
   },
 
   "errors": {
@@ -44,7 +53,7 @@
     "and": "and",
     "england": "England",
     "wales": "Wales",
-    "northernIreland": "Northern Ireland",
+    "northern-ireland": "Northern Ireland",
     "scotland": "Scotland",
     "sendFeedback": "Send feedback"
   },
@@ -145,6 +154,16 @@
       "bannerForce": "This is a preview of a [[previewMode]] form. Do not enter personal information.",
       "bannerText": "This is a preview of a [[previewMode]] form page you are editing.",
       "previousPages": "It depends on answers from earlier pages in the form. In the live version, users will need to complete those questions first."
+    },
+
+    "formUnavailable": {
+      "title": "Sorry, this form is unavailable",
+      "subHeading": "'[[formTitle]]' is no longer available.",
+      "contactDetailsHeading": "Contact details for [[organisationName]]",
+      "telephone": "Telephone",
+      "callCharges": "Find out about call charges",
+      "email": "Email",
+      "onlineContactForm": "Online contact form"
     }
   },
 
@@ -247,7 +266,16 @@
     },
 
     "locationFieldBase": {
-      "howToFind": "How to find location details"
+      "howToFind": "How to find location details",
+      "map": {
+        "helpPanel": {
+          "label": "How to use this map",
+          "point1": "Search for a place or postcode",
+          "point2": "Use the + and - icons to zoom in and out",
+          "point3": "Use a mouse or keyboard to centre the point at the location",
+          "point4": "Click to add the location to the map"
+        }
+      }
     },
 
     "yesNoField": {
@@ -270,6 +298,47 @@
     "geospatialField": {
       "added_one": "Added [[count]] location",
       "added_other": "Added [[count]] locations",
+      "map": {
+        "helpPanel": {
+          "label": "How to use this map",
+          "ledeIntro": "You can add",
+          "ledeOutro": "to the map.",
+          "lineText": "a line",
+          "shapeText": "a shape",
+          "lineOrShapeText": "a line or shape",
+          "typesPhrasePoint": "points",
+          "typesPhraseLine": "lines",
+          "typesPhraseShape": "shapes",
+          "typesPhraseOr": "or",
+          "point1": "Search for a county, place or postcode",
+          "point2": "Use the + and - icons to zoom in and out",
+          "point3": "Double‑click, or select 'Done', when you have finished drawing",
+          "point4": "Give the location a name"
+        },
+        "typeDescriptions": {
+          "point": "Point",
+          "line": "Line",
+          "polygon": "Shape"
+        },
+        "buttons": {
+          "point": "Add point",
+          "line": "Add line",
+          "polygon": "Add shape"
+        },
+        "itemLabel1": "Location",
+        "itemLabel2": "description",
+        "itemUpdateLink": "Update",
+        "itemDeleteLink": "Delete",
+        "itemFocusLink": "Show",
+        "itemVisuallyHidden": "location",
+        "details": {
+          "summary": "Coordinates",
+          "type": "Type",
+          "centroidGridReference": "Centre grid reference",
+          "firstPointGridReference": "First point grid reference",
+          "detailedCoordinates": "Detailed coordinates"
+        }
+      },
       "validation": {
         "descriptionRequired": "Enter description for location [[count]]",
         "wrongCountry": "Location [[count]] must be within [[country]]"

package/.server/server/plugins/engine/i18n/types.d.ts

@@ -15,6 +15,7 @@ export type FormDefinitionTranslations = Record<string, {
         shortDescription: string;
         errorDescription: string;
         paymentDescription: string;
+        instructionText: string;
     }>>;
     sections: Record<string, Partial<Pick<Section, 'title'>>>;
     listItems: Record<string, Partial<Pick<Item, 'text' | 'hint'>>>;

package/.server/server/plugins/engine/i18n/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../../../src/server/plugins/engine/i18n/types.ts"],"sourcesContent":["import {\n  type ComponentDef,\n  type Item,\n  type Page,\n  type Section\n} from '@defra/forms-model'\n\n/**\n * Structure of the `translations` block in a form definition.\n * Also used to derive the valid property keys for the typed tX functions.\n */\nexport type FormDefinitionTranslations = Record<\n  string,\n  {\n    pages: Record<string, Partial<{ title: string; repeatTitle: string }>>\n    // ComponentDef is a discriminated union; Pick across the full union is not feasible.\n    // The four keys below are the complete set of translatable component properties.\n    components: Record<\n      string,\n      Partial<{\n        title: string\n        hint: string\n        content: string\n        shortDescription: string\n        errorDescription: string\n        paymentDescription: string\n      }>\n    >\n    sections: Record<string, Partial<Pick<Section, 'title'>>>\n    listItems: Record<string, Partial<Pick<Item, 'text' | 'hint'>>>\n    form: Record<string, string>\n  }\n>\n\ntype EntityTranslations = FormDefinitionTranslations[string]\n\n/**\n * Scoped translator returned by model.createTranslator(language).\n * t          — plugin namespace (UI strings, buttons, errors, sub-field labels)\n * tForm      — form namespace: form attributes, currently only form name\n * tPage      — form namespace: page titles\n * tComponent — form namespace: component titles, hints, shortDescriptions\n * tSection   — form namespace: section titles\n * tListItem  — form namespace: list item text\n * language   - current language\n */\nexport interface Translator {\n  t: (key: string, opts?: Record<string, unknown>) => string\n  tForm: (prop: string) => string\n  tPage: (page: Page, prop: keyof EntityTranslations['pages'][string]) => string\n  tComponent: (\n    component: ComponentDef,\n    prop: keyof EntityTranslations['components'][string]\n  ) => string\n  tSection: (\n    section: Section,\n    prop: keyof EntityTranslations['sections'][string]\n  ) => string\n  tListItem: (\n    item: Item,\n    prop: keyof EntityTranslations['listItems'][string]\n  ) => string\n  language: string\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../../../src/server/plugins/engine/i18n/types.ts"],"sourcesContent":["import {\n  type ComponentDef,\n  type Item,\n  type Page,\n  type Section\n} from '@defra/forms-model'\n\n/**\n * Structure of the `translations` block in a form definition.\n * Also used to derive the valid property keys for the typed tX functions.\n */\nexport type FormDefinitionTranslations = Record<\n  string,\n  {\n    pages: Record<string, Partial<{ title: string; repeatTitle: string }>>\n    // ComponentDef is a discriminated union; Pick across the full union is not feasible.\n    // The four keys below are the complete set of translatable component properties.\n    components: Record<\n      string,\n      Partial<{\n        title: string\n        hint: string\n        content: string\n        shortDescription: string\n        errorDescription: string\n        paymentDescription: string\n        instructionText: string\n      }>\n    >\n    sections: Record<string, Partial<Pick<Section, 'title'>>>\n    listItems: Record<string, Partial<Pick<Item, 'text' | 'hint'>>>\n    form: Record<string, string>\n  }\n>\n\ntype EntityTranslations = FormDefinitionTranslations[string]\n\n/**\n * Scoped translator returned by model.createTranslator(language).\n * t          — plugin namespace (UI strings, buttons, errors, sub-field labels)\n * tForm      — form namespace: form attributes, currently only form name\n * tPage      — form namespace: page titles\n * tComponent — form namespace: component titles, hints, shortDescriptions\n * tSection   — form namespace: section titles\n * tListItem  — form namespace: list item text\n * language   - current language\n */\nexport interface Translator {\n  t: (key: string, opts?: Record<string, unknown>) => string\n  tForm: (prop: string) => string\n  tPage: (page: Page, prop: keyof EntityTranslations['pages'][string]) => string\n  tComponent: (\n    component: ComponentDef,\n    prop: keyof EntityTranslations['components'][string]\n  ) => string\n  tSection: (\n    section: Section,\n    prop: keyof EntityTranslations['sections'][string]\n  ) => string\n  tListItem: (\n    item: Item,\n    prop: keyof EntityTranslations['listItems'][string]\n  ) => string\n  language: string\n}\n"],"mappings":"","ignoreList":[]}

package/.server/server/plugins/engine/models/FormModel.js

@@ -7,6 +7,7 @@ import { EN_GB } from "../../../constants.js";
 import "../components/YesNoField.js";
 import { hasListFormField } from "../components/helpers/components.js";
 import { todayAsDateOnly } from "../date-helper.js";
+import { ConditionBuildError, SchemaValidationError } from "../errors.js";
 import { findPage, getError, getPage } from "../helpers.js";
 import { loadFormTranslations } from "../i18n/createFormTranslator.js";
 import { createTranslator } from "../i18n/createTranslator.js";
@@ -54,7 +55,7 @@ export class FormModel {
       abortEarly: false
     });
     if (result.error) {
-      throw result.error;
+      throw new SchemaValidationError(result.error);
     }
 
     // Make a clone of the shallow copy returned
@@ -180,7 +181,14 @@ export class FormModel {
       displayName,
       value
     } = condition;
-    const expr = this.toConditionExpression(value, parser);
+    let expr;
+    try {
+      expr = this.toConditionExpression(value, parser);
+    } catch (cause) {
+      throw new ConditionBuildError(displayName, {
+        cause
+      });
+    }
     const fn = evaluationState => {
       const ctx = this.toConditionContext(evaluationState, this.conditions);
       try {