@defra/forms-engine-plugin 5.0.0-alpha → 5.0.0-alpha.10

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","names":["ControllerPath","Engine","getErrorMessage","Boom","format","parseISO","StatusCodes","Liquid","logger","FORM_VERSION_METADATA_KEY","getAnswer","stripParam","FormAction","FormStatus","engine","outputEscape","jsTruthy","ownPropertyOnly","registerFilter","template","globals","context","evaluated","evaluateTemplate","path","pageDef","pages","get","query","page","pageMap","undefined","getPageHref","name","componentDef","components","component","componentMap","isFormComponent","field","translator","answer","relevantState","model","createTranslator","proceed","request","h","nextUrl","method","payload","returnUrl","isReturnAllowed","action","Continue","Validate","nextQuery","response","isPathRelative","redirect","redirectPath","code","SEE_OTHER","MOVED_TEMPORARILY","encodeUrl","link","URL","toString","err","error","pathOrQuery","queryOnly","Error","getHref","isRelative","params","Object","entries","filter","url","value","searchParams","set","pathname","search","href","startsWith","normalisePath","trim","replace","getPage","findPage","notFound","findPath","find","getStartPath","V2","startPath","def","at","Start","startPage","checkFormStatus","isPreview","state","Live","Draft","checkEmailAddressForLiveFormSubmission","emailAddress","internal","getErrors","details","length","map","getError","detail","message","key","text","createError","componentName","getExponentialBackoffDelay","depth","BASE_DELAY_MS","CAP_DELAY_MS","delay","Math","min","pageDefMap","componentDefMap","parseAndRenderSync","getCacheService","server","getPluginOptions","cacheService","getSaveAndExitHelpers","saveAndExit","plugins","handleLegacyRedirect","targetUrl","permanent","takeover","getFormVersion","definition","metadata"],"sources":["../../../../src/server/plugins/engine/helpers.ts"],"sourcesContent":["import {\n  ControllerPath,\n  Engine,\n  getErrorMessage,\n  type ComponentDef,\n  type FormDefinition,\n  type Page\n} from '@defra/forms-model'\nimport Boom from '@hapi/boom'\nimport { type ResponseToolkit, type Server } from '@hapi/hapi'\nimport { format, parseISO } from 'date-fns'\nimport { StatusCodes } from 'http-status-codes'\nimport { type Schema, type ValidationErrorItem } from 'joi'\nimport { Liquid } from 'liquidjs'\n\nimport { logger } from '~/src/server/common/helpers/logging/logger.js'\nimport { FORM_VERSION_METADATA_KEY } from '~/src/server/constants.js'\nimport {\n  getAnswer,\n  type Field\n} from '~/src/server/plugins/engine/components/helpers/components.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'\nimport { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'\nimport { stripParam } from '~/src/server/plugins/engine/pageControllers/helpers/state.js'\nimport {\n  type FormContext,\n  type FormContextRequest,\n  type FormSubmissionError\n} from '~/src/server/plugins/engine/types.js'\nimport {\n  FormAction,\n  FormStatus,\n  type FormParams,\n  type FormQuery,\n  type FormResponseToolkit\n} from '~/src/server/routes/types.js'\n\nexport const engine = new Liquid({\n  outputEscape: 'escape',\n  jsTruthy: true,\n  ownPropertyOnly: false\n})\n\nexport interface GlobalScope {\n  context: FormContext\n  pages: Map<string, Page>\n  components: Map<string, ComponentDef>\n}\n\nengine.registerFilter('evaluate', function (template?: string) {\n  if (typeof template !== 'string') {\n    return template\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const evaluated = evaluateTemplate(template, globals.context)\n\n  return evaluated\n})\n\nengine.registerFilter('page', function (path?: string) {\n  if (typeof path !== 'string') {\n    return\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const pageDef = globals.pages.get(path)\n\n  return pageDef\n})\n\nengine.registerFilter('href', function (path: string, query?: FormQuery) {\n  if (typeof path !== 'string') {\n    return\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const page = globals.context.pageMap.get(path)\n\n  if (page === undefined) {\n    return\n  }\n\n  return getPageHref(page, query)\n})\n\nengine.registerFilter('field', function (name: string) {\n  if (typeof name !== 'string') {\n    return\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const componentDef = globals.components.get(name)\n\n  return componentDef\n})\n\nengine.registerFilter('answer', function (name: string) {\n  if (typeof name !== 'string') {\n    return\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const component = globals.context.componentMap.get(name)\n\n  if (!component?.isFormComponent) {\n    return\n  }\n\n  const field = component as Field\n  const { translator } = globals.context\n  const answer = getAnswer(\n    field,\n    globals.context.relevantState,\n    translator ?? field.model.createTranslator(),\n    {\n      format: 'summary'\n    }\n  )\n\n  return answer\n})\n\nexport function proceed(\n  request: Pick<FormContextRequest, 'method' | 'payload' | 'query'>,\n  h: FormResponseToolkit,\n  nextUrl: string\n) {\n  const { method, payload, query } = request\n  const { returnUrl } = query\n\n  const isReturnAllowed =\n    payload && 'action' in payload\n      ? payload.action === FormAction.Continue ||\n        payload.action === FormAction.Validate\n      : false\n\n  // On POST, strip all query params to prevent them persisting across pages.\n  // On GET, forward params (minus returnUrl) so pre-population query params\n  // survive dispatch redirects (e.g. ?formId= reaching the start page).\n  const nextQuery =\n    method === 'get' ? stripParam(query, 'returnUrl') : undefined\n\n  // Redirect to return location (optional)\n  const response =\n    isReturnAllowed && isPathRelative(returnUrl)\n      ? h.redirect(returnUrl)\n      : h.redirect(redirectPath(nextUrl, nextQuery))\n\n  // Redirect POST to GET to avoid resubmission\n  return method === 'post'\n    ? response.code(StatusCodes.SEE_OTHER)\n    : response.code(StatusCodes.MOVED_TEMPORARILY)\n}\n\n/**\n * Encodes a URL, returning undefined if the process fails.\n */\nexport function encodeUrl(link?: string) {\n  if (link) {\n    try {\n      return new URL(link).toString() // escape the search params without breaking the ? and & reserved characters in rfc2368\n    } catch (err) {\n      logger.error(\n        err,\n        `[urlEncodingFailed] Failed to encode URL: ${link} - ${getErrorMessage(err)}`\n      )\n      throw err\n    }\n  }\n}\n\n/**\n * Get page href\n */\nexport function getPageHref(\n  page: PageControllerClass,\n  query?: FormQuery\n): string\n\n/**\n * Get page href by path\n */\nexport function getPageHref(\n  page: PageControllerClass,\n  path: string,\n  query?: FormQuery\n): string\n\nexport function getPageHref(\n  page: PageControllerClass,\n  pathOrQuery?: string | FormQuery,\n  queryOnly: FormQuery = {}\n) {\n  const path = typeof pathOrQuery === 'string' ? pathOrQuery : page.path\n  const query = typeof pathOrQuery === 'object' ? pathOrQuery : queryOnly\n\n  if (!isPathRelative(path)) {\n    throw Error(`Only relative URLs are allowed: ${path}`)\n  }\n\n  // Return path with page href as base\n  return redirectPath(page.getHref(path), query)\n}\n\n/**\n * Get redirect path with optional query params\n */\nexport function redirectPath(nextUrl: string, query: FormQuery = {}) {\n  const isRelative = isPathRelative(nextUrl)\n\n  // Filter string query params only\n  const params = Object.entries(query).filter(\n    (query): query is [string, string] => typeof query[1] === 'string'\n  )\n\n  // Build URL with relative path support\n  const url = isRelative\n    ? new URL(nextUrl, 'http://example.com')\n    : new URL(nextUrl)\n\n  // Append query params\n  for (const [name, value] of params) {\n    url.searchParams.set(name, value)\n  }\n\n  if (isRelative) {\n    return `${url.pathname}${url.search}`\n  }\n\n  return url.href\n}\n\nexport function isPathRelative(path?: string) {\n  return (path ?? '').startsWith('/')\n}\n\nexport function normalisePath(path = '') {\n  return path\n    .trim() // Trim empty spaces\n    .replace(/^\\//, '') // Remove leading slash\n    .replace(/\\/$/, '') // Remove trailing slash\n}\n\nexport function getPage(\n  model: FormModel | undefined,\n  request: FormContextRequest\n) {\n  const { params } = request\n\n  const page = findPage(model, `/${params.path}`)\n\n  if (!page) {\n    throw Boom.notFound(`No page found for /${params.path}`)\n  }\n\n  return page\n}\n\nexport function findPage(model: FormModel | undefined, path?: string) {\n  const findPath = `/${normalisePath(path)}`\n  return model?.pages.find(({ path }) => path === findPath)\n}\n\nexport function getStartPath(model?: FormModel) {\n  if (model?.engine === Engine.V2) {\n    const startPath = normalisePath(model.def.pages.at(0)?.path)\n    return startPath ? `/${startPath}` : ControllerPath.Start\n  }\n\n  const startPath = normalisePath(model?.def.startPage)\n  return startPath ? `/${startPath}` : ControllerPath.Start\n}\n\nexport function checkFormStatus(params?: FormParams) {\n  const isPreview = !!params?.state\n\n  let state = FormStatus.Live\n\n  if (isPreview && params.state === FormStatus.Draft) {\n    state = FormStatus.Draft\n  }\n\n  return {\n    isPreview,\n    state\n  }\n}\n\nexport function checkEmailAddressForLiveFormSubmission(\n  emailAddress: string | undefined,\n  isPreview: boolean\n) {\n  if (!emailAddress && !isPreview) {\n    throw Boom.internal(\n      'An email address is required to complete the form submission'\n    )\n  }\n}\n\n/**\n * Parses the errors from {@link Schema.validate} so they can be rendered by govuk-frontend templates\n * @param [details] - provided by {@link Schema.validate}\n */\nexport function getErrors(\n  details?: ValidationErrorItem[]\n): FormSubmissionError[] | undefined {\n  if (!details?.length) {\n    return\n  }\n\n  return details.map(getError)\n}\n\nexport function getError(detail: ValidationErrorItem): FormSubmissionError {\n  const { context, message, path } = detail\n\n  const name = context?.key ?? ''\n  const href = `#${name}`\n\n  const text = message.replace(\n    /\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d\\.\\d+([+-][0-2]\\d:[0-5]\\d|Z)/,\n    (text) => format(parseISO(text), 'd MMMM yyyy')\n  )\n\n  return {\n    path,\n    href,\n    name,\n    text,\n    context\n  }\n}\n\nexport function createError(componentName: string, message: string) {\n  return {\n    href: `#${componentName}`,\n    name: componentName,\n    text: message\n  }\n}\n\n/**\n * Calculates an exponential backoff delay (in milliseconds) based on the current retry depth,\n * using a base delay of 2000ms (2 seconds) and doubling for each additional depth, while capping the delay at 25,000ms (25 seconds).\n * @param depth - The current retry depth (1, 2, 3, …)\n * @returns The calculated delay in milliseconds.\n */\nexport function getExponentialBackoffDelay(depth: number): number {\n  const BASE_DELAY_MS = 2000 // 2 seconds initial delay\n  const CAP_DELAY_MS = 25000 // cap each delay to 25 seconds\n  const delay = BASE_DELAY_MS * 2 ** (depth - 1)\n  return Math.min(delay, CAP_DELAY_MS)\n}\n\nexport function evaluateTemplate(\n  template: string,\n  context: FormContext\n): string {\n  const globals: GlobalScope = {\n    context,\n    pages: context.pageDefMap,\n    components: context.componentDefMap\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n  return engine.parseAndRenderSync(template, context.relevantState, {\n    globals\n  })\n}\n\nexport function getCacheService(server: Server) {\n  return getPluginOptions(server).cacheService\n}\n\nexport function getSaveAndExitHelpers(server: Server) {\n  return getPluginOptions(server).saveAndExit\n}\n\nexport function getPluginOptions(server: Server) {\n  return server.plugins['forms-engine-plugin']\n}\n\n/**\n * Handles logging and issuing a permanent redirect for legacy routes.\n * @param h - The Hapi response toolkit.\n * @param targetUrl - The URL to redirect to.\n * @returns The Hapi response object configured for permanent redirect.\n */\nexport function handleLegacyRedirect(h: ResponseToolkit, targetUrl: string) {\n  return h.redirect(targetUrl).permanent().takeover()\n}\n\n/**\n * If the page doesn't have a title, set it from the title of the first form component\n * @param def - the form definition\n */\nexport interface FormVersionMetadata {\n  versionNumber: number\n  createdAt: Date\n}\n\n/**\n * Extracts form version metadata from a form definition\n */\nexport function getFormVersion(\n  definition: Pick<FormDefinition, 'metadata'>\n): FormVersionMetadata | undefined {\n  return definition.metadata?.[FORM_VERSION_METADATA_KEY] as\n    | FormVersionMetadata\n    | undefined\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"helpers.js","names":["ControllerPath","Engine","getErrorMessage","Boom","format","parseISO","cy","enGB","StatusCodes","Liquid","logger","CY","EN_GB","FORM_VERSION_METADATA_KEY","getAnswer","stripParam","FormAction","FormStatus","engine","outputEscape","jsTruthy","ownPropertyOnly","registerFilter","template","globals","context","evaluated","evaluateTemplate","path","pageDef","pages","get","query","page","pageMap","undefined","getPageHref","name","componentDef","components","component","componentMap","isFormComponent","field","translator","answer","relevantState","model","createTranslator","proceed","request","h","nextUrl","method","payload","returnUrl","isReturnAllowed","action","Continue","Validate","nextQuery","response","isPathRelative","redirect","redirectPath","code","SEE_OTHER","MOVED_TEMPORARILY","encodeUrl","link","URL","toString","err","error","pathOrQuery","queryOnly","Error","getHref","isRelative","params","Object","entries","filter","url","value","searchParams","set","pathname","search","href","startsWith","normalisePath","trim","replace","getPage","findPage","notFound","findPath","find","getStartPath","V2","startPath","def","at","Start","startPage","checkFormStatus","isPreview","state","Live","Draft","checkEmailAddressForLiveFormSubmission","emailAddress","internal","getErrors","language","details","length","map","detail","getError","message","key","text","locale","toLanguageLocale","createError","componentName","getExponentialBackoffDelay","depth","BASE_DELAY_MS","CAP_DELAY_MS","delay","Math","min","pageDefMap","componentDefMap","parseAndRenderSync","getCacheService","server","getPluginOptions","cacheService","getSaveAndExitHelpers","saveAndExit","plugins","handleLegacyRedirect","targetUrl","permanent","takeover","getFormVersion","definition","metadata","payLanguageCodes","languageLocales","defaultLanguageCode","defaultLanguageLocale","toPayLanguageCode"],"sources":["../../../../src/server/plugins/engine/helpers.ts"],"sourcesContent":["import {\n  ControllerPath,\n  Engine,\n  getErrorMessage,\n  type ComponentDef,\n  type FormDefinition,\n  type Page\n} from '@defra/forms-model'\nimport Boom from '@hapi/boom'\nimport { type ResponseToolkit, type Server } from '@hapi/hapi'\nimport { format, parseISO, type Locale } from 'date-fns'\nimport { cy, enGB } from 'date-fns/locale'\nimport { StatusCodes } from 'http-status-codes'\nimport { type Schema, type ValidationErrorItem } from 'joi'\nimport { Liquid } from 'liquidjs'\n\nimport { logger } from '~/src/server/common/helpers/logging/logger.js'\nimport { CY, EN_GB, FORM_VERSION_METADATA_KEY } from '~/src/server/constants.js'\nimport {\n  getAnswer,\n  type Field\n} from '~/src/server/plugins/engine/components/helpers/components.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'\nimport { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'\nimport { stripParam } from '~/src/server/plugins/engine/pageControllers/helpers/state.js'\nimport {\n  type FormContext,\n  type FormContextRequest,\n  type FormSubmissionError\n} from '~/src/server/plugins/engine/types.js'\nimport {\n  FormAction,\n  FormStatus,\n  type FormParams,\n  type FormQuery,\n  type FormResponseToolkit\n} from '~/src/server/routes/types.js'\n\nexport const engine = new Liquid({\n  outputEscape: 'escape',\n  jsTruthy: true,\n  ownPropertyOnly: false\n})\n\nexport interface GlobalScope {\n  context: FormContext\n  pages: Map<string, Page>\n  components: Map<string, ComponentDef>\n}\n\nengine.registerFilter('evaluate', function (template?: string) {\n  if (typeof template !== 'string') {\n    return template\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const evaluated = evaluateTemplate(template, globals.context)\n\n  return evaluated\n})\n\nengine.registerFilter('page', function (path?: string) {\n  if (typeof path !== 'string') {\n    return\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const pageDef = globals.pages.get(path)\n\n  return pageDef\n})\n\nengine.registerFilter('href', function (path: string, query?: FormQuery) {\n  if (typeof path !== 'string') {\n    return\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const page = globals.context.pageMap.get(path)\n\n  if (page === undefined) {\n    return\n  }\n\n  return getPageHref(page, query)\n})\n\nengine.registerFilter('field', function (name: string) {\n  if (typeof name !== 'string') {\n    return\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const componentDef = globals.components.get(name)\n\n  return componentDef\n})\n\nengine.registerFilter('answer', function (name: string) {\n  if (typeof name !== 'string') {\n    return\n  }\n\n  const globals = this.context.globals as GlobalScope\n  const component = globals.context.componentMap.get(name)\n\n  if (!component?.isFormComponent) {\n    return\n  }\n\n  const field = component as Field\n  const { translator } = globals.context\n  const answer = getAnswer(\n    field,\n    globals.context.relevantState,\n    translator ?? field.model.createTranslator(),\n    {\n      format: 'summary'\n    }\n  )\n\n  return answer\n})\n\nexport function proceed(\n  request: Pick<FormContextRequest, 'method' | 'payload' | 'query'>,\n  h: FormResponseToolkit,\n  nextUrl: string\n) {\n  const { method, payload, query } = request\n  const { returnUrl } = query\n\n  const isReturnAllowed =\n    payload && 'action' in payload\n      ? payload.action === FormAction.Continue ||\n        payload.action === FormAction.Validate\n      : false\n\n  // On POST, strip all query params to prevent them persisting across pages.\n  // On GET, forward params (minus returnUrl) so pre-population query params\n  // survive dispatch redirects (e.g. ?formId= reaching the start page).\n  const nextQuery =\n    method === 'get' ? stripParam(query, 'returnUrl') : undefined\n\n  // Redirect to return location (optional)\n  const response =\n    isReturnAllowed && isPathRelative(returnUrl)\n      ? h.redirect(returnUrl)\n      : h.redirect(redirectPath(nextUrl, nextQuery))\n\n  // Redirect POST to GET to avoid resubmission\n  return method === 'post'\n    ? response.code(StatusCodes.SEE_OTHER)\n    : response.code(StatusCodes.MOVED_TEMPORARILY)\n}\n\n/**\n * Encodes a URL, returning undefined if the process fails.\n */\nexport function encodeUrl(link?: string) {\n  if (link) {\n    try {\n      return new URL(link).toString() // escape the search params without breaking the ? and & reserved characters in rfc2368\n    } catch (err) {\n      logger.error(\n        err,\n        `[urlEncodingFailed] Failed to encode URL: ${link} - ${getErrorMessage(err)}`\n      )\n      throw err\n    }\n  }\n}\n\n/**\n * Get page href\n */\nexport function getPageHref(\n  page: PageControllerClass,\n  query?: FormQuery\n): string\n\n/**\n * Get page href by path\n */\nexport function getPageHref(\n  page: PageControllerClass,\n  path: string,\n  query?: FormQuery\n): string\n\nexport function getPageHref(\n  page: PageControllerClass,\n  pathOrQuery?: string | FormQuery,\n  queryOnly: FormQuery = {}\n) {\n  const path = typeof pathOrQuery === 'string' ? pathOrQuery : page.path\n  const query = typeof pathOrQuery === 'object' ? pathOrQuery : queryOnly\n\n  if (!isPathRelative(path)) {\n    throw Error(`Only relative URLs are allowed: ${path}`)\n  }\n\n  // Return path with page href as base\n  return redirectPath(page.getHref(path), query)\n}\n\n/**\n * Get redirect path with optional query params\n */\nexport function redirectPath(nextUrl: string, query: FormQuery = {}) {\n  const isRelative = isPathRelative(nextUrl)\n\n  // Filter string query params only\n  const params = Object.entries(query).filter(\n    (query): query is [string, string] => typeof query[1] === 'string'\n  )\n\n  // Build URL with relative path support\n  const url = isRelative\n    ? new URL(nextUrl, 'http://example.com')\n    : new URL(nextUrl)\n\n  // Append query params\n  for (const [name, value] of params) {\n    url.searchParams.set(name, value)\n  }\n\n  if (isRelative) {\n    return `${url.pathname}${url.search}`\n  }\n\n  return url.href\n}\n\nexport function isPathRelative(path?: string) {\n  return (path ?? '').startsWith('/')\n}\n\nexport function normalisePath(path = '') {\n  return path\n    .trim() // Trim empty spaces\n    .replace(/^\\//, '') // Remove leading slash\n    .replace(/\\/$/, '') // Remove trailing slash\n}\n\nexport function getPage(\n  model: FormModel | undefined,\n  request: FormContextRequest\n) {\n  const { params } = request\n\n  const page = findPage(model, `/${params.path}`)\n\n  if (!page) {\n    throw Boom.notFound(`No page found for /${params.path}`)\n  }\n\n  return page\n}\n\nexport function findPage(model: FormModel | undefined, path?: string) {\n  const findPath = `/${normalisePath(path)}`\n  return model?.pages.find(({ path }) => path === findPath)\n}\n\nexport function getStartPath(model?: FormModel) {\n  if (model?.engine === Engine.V2) {\n    const startPath = normalisePath(model.def.pages.at(0)?.path)\n    return startPath ? `/${startPath}` : ControllerPath.Start\n  }\n\n  const startPath = normalisePath(model?.def.startPage)\n  return startPath ? `/${startPath}` : ControllerPath.Start\n}\n\nexport function checkFormStatus(params?: FormParams) {\n  const isPreview = !!params?.state\n\n  let state = FormStatus.Live\n\n  if (isPreview && params.state === FormStatus.Draft) {\n    state = FormStatus.Draft\n  }\n\n  return {\n    isPreview,\n    state\n  }\n}\n\nexport function checkEmailAddressForLiveFormSubmission(\n  emailAddress: string | undefined,\n  isPreview: boolean\n) {\n  if (!emailAddress && !isPreview) {\n    throw Boom.internal(\n      'An email address is required to complete the form submission'\n    )\n  }\n}\n\n/**\n * Parses the errors from {@link Schema.validate} so they can be rendered by govuk-frontend templates\n * @param language - the target language for translations\n * @param [details] - provided by {@link Schema.validate}\n */\nexport function getErrors(\n  language: string | undefined,\n  details?: ValidationErrorItem[]\n): FormSubmissionError[] | undefined {\n  if (!details?.length) {\n    return\n  }\n\n  return details.map((detail) => getError(language, detail))\n}\n\nexport function getError(\n  language: string | undefined,\n  detail: ValidationErrorItem\n): FormSubmissionError {\n  const { context, message, path } = detail\n\n  const name = context?.key ?? ''\n  const href = `#${name}`\n\n  const text = message.replace(\n    /\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d\\.\\d+([+-][0-2]\\d:[0-5]\\d|Z)/,\n    (text) =>\n      format(parseISO(text), 'd MMMM yyyy', {\n        locale: toLanguageLocale(language)\n      })\n  )\n\n  return {\n    path,\n    href,\n    name,\n    text,\n    context\n  }\n}\n\nexport function createError(componentName: string, message: string) {\n  return {\n    href: `#${componentName}`,\n    name: componentName,\n    text: message\n  }\n}\n\n/**\n * Calculates an exponential backoff delay (in milliseconds) based on the current retry depth,\n * using a base delay of 2000ms (2 seconds) and doubling for each additional depth, while capping the delay at 25,000ms (25 seconds).\n * @param depth - The current retry depth (1, 2, 3, …)\n * @returns The calculated delay in milliseconds.\n */\nexport function getExponentialBackoffDelay(depth: number): number {\n  const BASE_DELAY_MS = 2000 // 2 seconds initial delay\n  const CAP_DELAY_MS = 25000 // cap each delay to 25 seconds\n  const delay = BASE_DELAY_MS * 2 ** (depth - 1)\n  return Math.min(delay, CAP_DELAY_MS)\n}\n\nexport function evaluateTemplate(\n  template: string,\n  context: FormContext\n): string {\n  const globals: GlobalScope = {\n    context,\n    pages: context.pageDefMap,\n    components: context.componentDefMap\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n  return engine.parseAndRenderSync(template, context.relevantState, {\n    globals\n  })\n}\n\nexport function getCacheService(server: Server) {\n  return getPluginOptions(server).cacheService\n}\n\nexport function getSaveAndExitHelpers(server: Server) {\n  return getPluginOptions(server).saveAndExit\n}\n\nexport function getPluginOptions(server: Server) {\n  return server.plugins['forms-engine-plugin']\n}\n\n/**\n * Handles logging and issuing a permanent redirect for legacy routes.\n * @param h - The Hapi response toolkit.\n * @param targetUrl - The URL to redirect to.\n * @returns The Hapi response object configured for permanent redirect.\n */\nexport function handleLegacyRedirect(h: ResponseToolkit, targetUrl: string) {\n  return h.redirect(targetUrl).permanent().takeover()\n}\n\n/**\n * If the page doesn't have a title, set it from the title of the first form component\n * @param def - the form definition\n */\nexport interface FormVersionMetadata {\n  versionNumber: number\n  createdAt: Date\n}\n\n/**\n * Extracts form version metadata from a form definition\n */\nexport function getFormVersion(\n  definition: Pick<FormDefinition, 'metadata'>\n): FormVersionMetadata | undefined {\n  return definition.metadata?.[FORM_VERSION_METADATA_KEY] as\n    | FormVersionMetadata\n    | undefined\n}\n\nconst payLanguageCodes = {\n  [EN_GB]: 'en',\n  [CY]: 'cy'\n} as Record<string, string>\n\nconst languageLocales = {\n  [EN_GB]: enGB,\n  [CY]: cy\n} as Record<string, Locale>\n\nconst defaultLanguageCode = 'en'\nconst defaultLanguageLocale = enGB\n\n/**\n * Converts a BCP 47 language tag to the ISO 639-1 code GOV.UK Pay accepts.\n * Defaults to English if the language is not supported.\n * @param { string | undefined } language - BCP 47 language code\n * @returns {string} language code required by GOV.UK Pay\n */\nexport function toPayLanguageCode(language: string | undefined): string {\n  return payLanguageCodes[language ?? 'unknown'] ?? defaultLanguageCode\n}\n\n/**\n * Converts a BCP 47 language tag to the date-fns Locale (for date formatting).\n * Defaults to English if the language is not supported.\n * @param { string | undefined } language - BCP 47 language code\n * @returns {Locale} language locale\n */\nexport function toLanguageLocale(language: string | undefined): Locale {\n  return languageLocales[language ?? 'unknown'] ?? defaultLanguageLocale\n}\n\n/**\n * @import { FormsService } from '~/src/server/types.js'\n * @import { Locale } from 'date-fns/locale'\n */\n"],"mappings":"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","ignoreList":[]}

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

@@ -35,5 +35,8 @@ export declare function buildValidationMessages(t: (key: string) => string): {
     featuresMin: string;
     featuresMax: string;
     featuresLength: string;
+    filesMin: string;
+    filesMax: string;
+    filesLength: string;
 };
 export type ValidationMessages = ReturnType<typeof buildValidationMessages>;

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

@@ -38,13 +38,16 @@ export function buildValidationMessages(t) {
     dateFormat: t('components.dateField.validation.dateFormat'),
     dateMin: t('components.dateField.validation.dateMin'),
     dateMax: t('components.dateField.validation.dateMax'),
-    unicode: 'validation.unicode',
-    arrayMin: 'validation.array.min',
-    arrayMax: 'validation.array.max',
-    arrayLength: 'validation.array.length',
-    featuresMin: 'validation.features.min',
-    featuresMax: 'validation.features.max',
-    featuresLength: 'validation.features.length'
+    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')
   };
 }
 //# 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"],"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: 'validation.unicode',\n    arrayMin: 'validation.array.min',\n    arrayMax: 'validation.array.max',\n    arrayLength: 'validation.array.length',\n    featuresMin: 'validation.features.min',\n    featuresMax: 'validation.features.max',\n    featuresLength: 'validation.features.length'\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,EAAE,oBAAoB;IAC7BC,QAAQ,EAAE,sBAAsB;IAChCC,QAAQ,EAAE,sBAAsB;IAChCC,WAAW,EAAE,yBAAyB;IACtCC,WAAW,EAAE,yBAAyB;IACtCC,WAAW,EAAE,yBAAyB;IACtCC,cAAc,EAAE;EAClB,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","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":[]}

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

@@ -1,5 +1,5 @@
-import { type FormDefinition } from '@defra/forms-model';
+import { type FormDefinition, type FormMetadata } from '@defra/forms-model';
 import { type i18n } from 'i18next';
-import { type Translator } from '../../../../server/plugins/engine/i18n/types.js';
-export declare function createFormTranslator(def: FormDefinition, language: string): Translator;
-export declare function loadFormTranslations(def: FormDefinition, i18nInstance: i18n): void;
+export declare function createFormTranslator(metadata: FormMetadata, definition: FormDefinition | undefined, language: string): import("../../../../server/plugins/engine/i18n/types.js").Translator;
+export declare function loadFormTranslations(def: FormDefinition | undefined, i18nInstance: i18n): void;
+export declare function extractMetadataBaseTranslations(metadata: FormMetadata | undefined, i18nInstance: i18n): void;

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

@@ -1,18 +1,47 @@
+import { yesNoListNoItemId, yesNoListYesItemId } from '@defra/forms-model';
+import { CY } from "../../../constants.js";
 import { createTranslator } from "./createTranslator.js";
 import { extractBaseTranslations } from "./extractBaseTranslations.js";
 import { createFormI18nInstance } from "./index.js";
-export function createFormTranslator(def, language) {
-  const baseTranslations = extractBaseTranslations(def);
+export function createFormTranslator(metadata, definition, language) {
+  const baseTranslations = extractBaseTranslations(definition);
   const i18nInstance = createFormI18nInstance(baseTranslations);
-  loadFormTranslations(def, i18nInstance);
-  return createTranslator(i18nInstance, language);
+  loadFormTranslations(definition, i18nInstance);
+  extractMetadataBaseTranslations(metadata, i18nInstance);
+  const translator = createTranslator(i18nInstance, language);
+  return translator;
 }
 export function loadFormTranslations(def, i18nInstance) {
+  if (!def) {
+    return;
+  }
   const formTranslations = def.metadata?.translations;
   if (formTranslations) {
     for (const [lng, resources] of Object.entries(formTranslations)) {
       i18nInstance.addResourceBundle(lng, 'form', resources, true, true);
+
+      // Temporary workaround - until we develop a better solution
+      if (lng === CY) {
+        i18nInstance.addResource(lng, 'form', `listItems.${yesNoListYesItemId}.text`, 'Ie');
+        i18nInstance.addResource(lng, 'form', `listItems.${yesNoListNoItemId}.text`, 'Nage');
+      }
     }
   }
 }
+export function extractMetadataBaseTranslations(metadata, i18nInstance) {
+  if (metadata) {
+    const translations = {
+      'form.title': metadata.title,
+      'form.contact.email.address': metadata.contact?.email?.address ?? '',
+      'form.contact.email.responseTime': metadata.contact?.email?.responseTime ?? '',
+      'form.contact.online.url': metadata.contact?.online?.url ?? '',
+      'form.contact.online.text': metadata.contact?.online?.text ?? '',
+      'form.contact.phone': metadata.contact?.phone ?? '',
+      'form.submissionGuidance': metadata.submissionGuidance ?? '',
+      'form.privacyNoticeText': metadata.privacyNoticeText ?? '',
+      'form.privacyNoticeUrl': metadata.privacyNoticeUrl ?? ''
+    };
+    i18nInstance.addResourceBundle('en-GB', 'form', translations, true, true);
+  }
+}
 //# sourceMappingURL=createFormTranslator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"createFormTranslator.js","names":["createTranslator","extractBaseTranslations","createFormI18nInstance","createFormTranslator","def","language","baseTranslations","i18nInstance","loadFormTranslations","formTranslations","metadata","translations","lng","resources","Object","entries","addResourceBundle"],"sources":["../../../../../src/server/plugins/engine/i18n/createFormTranslator.ts"],"sourcesContent":["import { type FormDefinition } from '@defra/forms-model'\nimport { type i18n } from 'i18next'\n\nimport { createTranslator } from '~/src/server/plugins/engine/i18n/createTranslator.js'\nimport { extractBaseTranslations } from '~/src/server/plugins/engine/i18n/extractBaseTranslations.js'\nimport { createFormI18nInstance } from '~/src/server/plugins/engine/i18n/index.js'\nimport {\n  type FormDefinitionTranslations,\n  type Translator\n} from '~/src/server/plugins/engine/i18n/types.js'\n\nexport function createFormTranslator(\n  def: FormDefinition,\n  language: string\n): Translator {\n  const baseTranslations = extractBaseTranslations(def)\n  const i18nInstance = createFormI18nInstance(baseTranslations)\n  loadFormTranslations(def, i18nInstance)\n\n  return createTranslator(i18nInstance, language)\n}\n\nexport function loadFormTranslations(def: FormDefinition, i18nInstance: i18n) {\n  const formTranslations = def.metadata?.translations as\n    | FormDefinitionTranslations\n    | undefined\n\n  if (formTranslations) {\n    for (const [lng, resources] of Object.entries(formTranslations)) {\n      i18nInstance.addResourceBundle(lng, 'form', resources, true, true)\n    }\n  }\n}\n"],"mappings":"AAGA,SAASA,gBAAgB;AACzB,SAASC,uBAAuB;AAChC,SAASC,sBAAsB;AAM/B,OAAO,SAASC,oBAAoBA,CAClCC,GAAmB,EACnBC,QAAgB,EACJ;EACZ,MAAMC,gBAAgB,GAAGL,uBAAuB,CAACG,GAAG,CAAC;EACrD,MAAMG,YAAY,GAAGL,sBAAsB,CAACI,gBAAgB,CAAC;EAC7DE,oBAAoB,CAACJ,GAAG,EAAEG,YAAY,CAAC;EAEvC,OAAOP,gBAAgB,CAACO,YAAY,EAAEF,QAAQ,CAAC;AACjD;AAEA,OAAO,SAASG,oBAAoBA,CAACJ,GAAmB,EAAEG,YAAkB,EAAE;EAC5E,MAAME,gBAAgB,GAAGL,GAAG,CAACM,QAAQ,EAAEC,YAE1B;EAEb,IAAIF,gBAAgB,EAAE;IACpB,KAAK,MAAM,CAACG,GAAG,EAAEC,SAAS,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACN,gBAAgB,CAAC,EAAE;MAC/DF,YAAY,CAACS,iBAAiB,CAACJ,GAAG,EAAE,MAAM,EAAEC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;IACpE;EACF;AACF","ignoreList":[]}
+{"version":3,"file":"createFormTranslator.js","names":["yesNoListNoItemId","yesNoListYesItemId","CY","createTranslator","extractBaseTranslations","createFormI18nInstance","createFormTranslator","metadata","definition","language","baseTranslations","i18nInstance","loadFormTranslations","extractMetadataBaseTranslations","translator","def","formTranslations","translations","lng","resources","Object","entries","addResourceBundle","addResource","title","contact","email","address","responseTime","online","url","text","phone","submissionGuidance","privacyNoticeText","privacyNoticeUrl"],"sources":["../../../../../src/server/plugins/engine/i18n/createFormTranslator.ts"],"sourcesContent":["import {\n  yesNoListNoItemId,\n  yesNoListYesItemId,\n  type FormDefinition,\n  type FormMetadata\n} from '@defra/forms-model'\nimport { type i18n } from 'i18next'\n\nimport { CY } from '~/src/server/constants.js'\nimport { createTranslator } from '~/src/server/plugins/engine/i18n/createTranslator.js'\nimport { extractBaseTranslations } from '~/src/server/plugins/engine/i18n/extractBaseTranslations.js'\nimport { createFormI18nInstance } from '~/src/server/plugins/engine/i18n/index.js'\nimport { type FormDefinitionTranslations } from '~/src/server/plugins/engine/i18n/types.js'\n\nexport function createFormTranslator(\n  metadata: FormMetadata,\n  definition: FormDefinition | undefined,\n  language: string\n) {\n  const baseTranslations = extractBaseTranslations(definition)\n  const i18nInstance = createFormI18nInstance(baseTranslations)\n  loadFormTranslations(definition, i18nInstance)\n  extractMetadataBaseTranslations(metadata, i18nInstance)\n\n  const translator = createTranslator(i18nInstance, language)\n\n  return translator\n}\n\nexport function loadFormTranslations(\n  def: FormDefinition | undefined,\n  i18nInstance: i18n\n) {\n  if (!def) {\n    return\n  }\n\n  const formTranslations = def.metadata?.translations as\n    | FormDefinitionTranslations\n    | undefined\n\n  if (formTranslations) {\n    for (const [lng, resources] of Object.entries(formTranslations)) {\n      i18nInstance.addResourceBundle(lng, 'form', resources, true, true)\n\n      // Temporary workaround - until we develop a better solution\n      if (lng === CY) {\n        i18nInstance.addResource(\n          lng,\n          'form',\n          `listItems.${yesNoListYesItemId}.text`,\n          'Ie'\n        )\n        i18nInstance.addResource(\n          lng,\n          'form',\n          `listItems.${yesNoListNoItemId}.text`,\n          'Nage'\n        )\n      }\n    }\n  }\n}\n\nexport function extractMetadataBaseTranslations(\n  metadata: FormMetadata | undefined,\n  i18nInstance: i18n\n) {\n  if (metadata) {\n    const translations = {\n      'form.title': metadata.title,\n      'form.contact.email.address': metadata.contact?.email?.address ?? '',\n      'form.contact.email.responseTime':\n        metadata.contact?.email?.responseTime ?? '',\n      'form.contact.online.url': metadata.contact?.online?.url ?? '',\n      'form.contact.online.text': metadata.contact?.online?.text ?? '',\n      'form.contact.phone': metadata.contact?.phone ?? '',\n      'form.submissionGuidance': metadata.submissionGuidance ?? '',\n      'form.privacyNoticeText': metadata.privacyNoticeText ?? '',\n      'form.privacyNoticeUrl': metadata.privacyNoticeUrl ?? ''\n    }\n    i18nInstance.addResourceBundle('en-GB', 'form', translations, true, true)\n  }\n}\n"],"mappings":"AAAA,SACEA,iBAAiB,EACjBC,kBAAkB,QAGb,oBAAoB;AAG3B,SAASC,EAAE;AACX,SAASC,gBAAgB;AACzB,SAASC,uBAAuB;AAChC,SAASC,sBAAsB;AAG/B,OAAO,SAASC,oBAAoBA,CAClCC,QAAsB,EACtBC,UAAsC,EACtCC,QAAgB,EAChB;EACA,MAAMC,gBAAgB,GAAGN,uBAAuB,CAACI,UAAU,CAAC;EAC5D,MAAMG,YAAY,GAAGN,sBAAsB,CAACK,gBAAgB,CAAC;EAC7DE,oBAAoB,CAACJ,UAAU,EAAEG,YAAY,CAAC;EAC9CE,+BAA+B,CAACN,QAAQ,EAAEI,YAAY,CAAC;EAEvD,MAAMG,UAAU,GAAGX,gBAAgB,CAACQ,YAAY,EAAEF,QAAQ,CAAC;EAE3D,OAAOK,UAAU;AACnB;AAEA,OAAO,SAASF,oBAAoBA,CAClCG,GAA+B,EAC/BJ,YAAkB,EAClB;EACA,IAAI,CAACI,GAAG,EAAE;IACR;EACF;EAEA,MAAMC,gBAAgB,GAAGD,GAAG,CAACR,QAAQ,EAAEU,YAE1B;EAEb,IAAID,gBAAgB,EAAE;IACpB,KAAK,MAAM,CAACE,GAAG,EAAEC,SAAS,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,gBAAgB,CAAC,EAAE;MAC/DL,YAAY,CAACW,iBAAiB,CAACJ,GAAG,EAAE,MAAM,EAAEC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;;MAElE;MACA,IAAID,GAAG,KAAKhB,EAAE,EAAE;QACdS,YAAY,CAACY,WAAW,CACtBL,GAAG,EACH,MAAM,EACN,aAAajB,kBAAkB,OAAO,EACtC,IACF,CAAC;QACDU,YAAY,CAACY,WAAW,CACtBL,GAAG,EACH,MAAM,EACN,aAAalB,iBAAiB,OAAO,EACrC,MACF,CAAC;MACH;IACF;EACF;AACF;AAEA,OAAO,SAASa,+BAA+BA,CAC7CN,QAAkC,EAClCI,YAAkB,EAClB;EACA,IAAIJ,QAAQ,EAAE;IACZ,MAAMU,YAAY,GAAG;MACnB,YAAY,EAAEV,QAAQ,CAACiB,KAAK;MAC5B,4BAA4B,EAAEjB,QAAQ,CAACkB,OAAO,EAAEC,KAAK,EAAEC,OAAO,IAAI,EAAE;MACpE,iCAAiC,EAC/BpB,QAAQ,CAACkB,OAAO,EAAEC,KAAK,EAAEE,YAAY,IAAI,EAAE;MAC7C,yBAAyB,EAAErB,QAAQ,CAACkB,OAAO,EAAEI,MAAM,EAAEC,GAAG,IAAI,EAAE;MAC9D,0BAA0B,EAAEvB,QAAQ,CAACkB,OAAO,EAAEI,MAAM,EAAEE,IAAI,IAAI,EAAE;MAChE,oBAAoB,EAAExB,QAAQ,CAACkB,OAAO,EAAEO,KAAK,IAAI,EAAE;MACnD,yBAAyB,EAAEzB,QAAQ,CAAC0B,kBAAkB,IAAI,EAAE;MAC5D,wBAAwB,EAAE1B,QAAQ,CAAC2B,iBAAiB,IAAI,EAAE;MAC1D,uBAAuB,EAAE3B,QAAQ,CAAC4B,gBAAgB,IAAI;IACxD,CAAC;IACDxB,YAAY,CAACW,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAEL,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC;EAC3E;AACF","ignoreList":[]}

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

@@ -1,5 +1,5 @@
 import { type FormDefinition } from '@defra/forms-model';
 import { type FormDefinitionTranslations } from '../../../../server/plugins/engine/i18n/types.js';
 type BaseTranslations = FormDefinitionTranslations[string];
-export declare function extractBaseTranslations(def: FormDefinition): BaseTranslations;
+export declare function extractBaseTranslations(def: FormDefinition | undefined): BaseTranslations;
 export {};

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

@@ -5,6 +5,15 @@ export function extractBaseTranslations(def) {
   const sections = {};
   const listItems = {};
   const form = {};
+  if (!def) {
+    return {
+      pages,
+      components,
+      sections,
+      listItems,
+      form
+    };
+  }
   for (const page of def.pages) {
     if (page.id && page.title) {
       pages[page.id] = {

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

@@ -1 +1 @@
-{"version":3,"file":"extractBaseTranslations.js","names":["hasComponentsEvenIfNoNext","extractBaseTranslations","def","pages","components","sections","listItems","form","page","id","title","component","entry","hint","content","shortDescription","Object","keys","length","section","list","lists","item","items","text","name"],"sources":["../../../../../src/server/plugins/engine/i18n/extractBaseTranslations.ts"],"sourcesContent":["import {\n  hasComponentsEvenIfNoNext,\n  type FormDefinition\n} from '@defra/forms-model'\n\nimport { type FormDefinitionTranslations } from '~/src/server/plugins/engine/i18n/types.js'\n\ntype BaseTranslations = FormDefinitionTranslations[string]\n\nexport function extractBaseTranslations(def: FormDefinition): BaseTranslations {\n  const pages: BaseTranslations['pages'] = {}\n  const components: BaseTranslations['components'] = {}\n  const sections: BaseTranslations['sections'] = {}\n  const listItems: BaseTranslations['listItems'] = {}\n  const form: BaseTranslations['form'] = {}\n\n  for (const page of def.pages) {\n    if (page.id && page.title) {\n      pages[page.id] = { title: page.title }\n    }\n\n    if (hasComponentsEvenIfNoNext(page)) {\n      for (const component of page.components) {\n        if (!component.id) continue\n\n        const entry: BaseTranslations['components'][string] = {}\n\n        if (component.title) entry.title = component.title\n        if ('hint' in component && component.hint) entry.hint = component.hint\n        if ('content' in component && component.content) {\n          entry.content = component.content\n        }\n        if ('shortDescription' in component && component.shortDescription) {\n          entry.shortDescription = component.shortDescription\n        }\n\n        if (Object.keys(entry).length) {\n          components[component.id] = entry\n        }\n      }\n    }\n  }\n\n  for (const section of def.sections) {\n    if (section.id && section.title) {\n      sections[section.id] = { title: section.title }\n    }\n  }\n\n  for (const list of def.lists) {\n    for (const item of list.items) {\n      if (item.id && item.text) {\n        listItems[item.id] = { text: item.text }\n      }\n    }\n  }\n\n  form.title = def.name ?? ''\n\n  return { pages, components, sections, listItems, form }\n}\n"],"mappings":"AAAA,SACEA,yBAAyB,QAEpB,oBAAoB;AAM3B,OAAO,SAASC,uBAAuBA,CAACC,GAAmB,EAAoB;EAC7E,MAAMC,KAAgC,GAAG,CAAC,CAAC;EAC3C,MAAMC,UAA0C,GAAG,CAAC,CAAC;EACrD,MAAMC,QAAsC,GAAG,CAAC,CAAC;EACjD,MAAMC,SAAwC,GAAG,CAAC,CAAC;EACnD,MAAMC,IAA8B,GAAG,CAAC,CAAC;EAEzC,KAAK,MAAMC,IAAI,IAAIN,GAAG,CAACC,KAAK,EAAE;IAC5B,IAAIK,IAAI,CAACC,EAAE,IAAID,IAAI,CAACE,KAAK,EAAE;MACzBP,KAAK,CAACK,IAAI,CAACC,EAAE,CAAC,GAAG;QAAEC,KAAK,EAAEF,IAAI,CAACE;MAAM,CAAC;IACxC;IAEA,IAAIV,yBAAyB,CAACQ,IAAI,CAAC,EAAE;MACnC,KAAK,MAAMG,SAAS,IAAIH,IAAI,CAACJ,UAAU,EAAE;QACvC,IAAI,CAACO,SAAS,CAACF,EAAE,EAAE;QAEnB,MAAMG,KAA6C,GAAG,CAAC,CAAC;QAExD,IAAID,SAAS,CAACD,KAAK,EAAEE,KAAK,CAACF,KAAK,GAAGC,SAAS,CAACD,KAAK;QAClD,IAAI,MAAM,IAAIC,SAAS,IAAIA,SAAS,CAACE,IAAI,EAAED,KAAK,CAACC,IAAI,GAAGF,SAAS,CAACE,IAAI;QACtE,IAAI,SAAS,IAAIF,SAAS,IAAIA,SAAS,CAACG,OAAO,EAAE;UAC/CF,KAAK,CAACE,OAAO,GAAGH,SAAS,CAACG,OAAO;QACnC;QACA,IAAI,kBAAkB,IAAIH,SAAS,IAAIA,SAAS,CAACI,gBAAgB,EAAE;UACjEH,KAAK,CAACG,gBAAgB,GAAGJ,SAAS,CAACI,gBAAgB;QACrD;QAEA,IAAIC,MAAM,CAACC,IAAI,CAACL,KAAK,CAAC,CAACM,MAAM,EAAE;UAC7Bd,UAAU,CAACO,SAAS,CAACF,EAAE,CAAC,GAAGG,KAAK;QAClC;MACF;IACF;EACF;EAEA,KAAK,MAAMO,OAAO,IAAIjB,GAAG,CAACG,QAAQ,EAAE;IAClC,IAAIc,OAAO,CAACV,EAAE,IAAIU,OAAO,CAACT,KAAK,EAAE;MAC/BL,QAAQ,CAACc,OAAO,CAACV,EAAE,CAAC,GAAG;QAAEC,KAAK,EAAES,OAAO,CAACT;MAAM,CAAC;IACjD;EACF;EAEA,KAAK,MAAMU,IAAI,IAAIlB,GAAG,CAACmB,KAAK,EAAE;IAC5B,KAAK,MAAMC,IAAI,IAAIF,IAAI,CAACG,KAAK,EAAE;MAC7B,IAAID,IAAI,CAACb,EAAE,IAAIa,IAAI,CAACE,IAAI,EAAE;QACxBlB,SAAS,CAACgB,IAAI,CAACb,EAAE,CAAC,GAAG;UAAEe,IAAI,EAAEF,IAAI,CAACE;QAAK,CAAC;MAC1C;IACF;EACF;EAEAjB,IAAI,CAACG,KAAK,GAAGR,GAAG,CAACuB,IAAI,IAAI,EAAE;EAE3B,OAAO;IAAEtB,KAAK;IAAEC,UAAU;IAAEC,QAAQ;IAAEC,SAAS;IAAEC;EAAK,CAAC;AACzD","ignoreList":[]}
+{"version":3,"file":"extractBaseTranslations.js","names":["hasComponentsEvenIfNoNext","extractBaseTranslations","def","pages","components","sections","listItems","form","page","id","title","component","entry","hint","content","shortDescription","Object","keys","length","section","list","lists","item","items","text","name"],"sources":["../../../../../src/server/plugins/engine/i18n/extractBaseTranslations.ts"],"sourcesContent":["import {\n  hasComponentsEvenIfNoNext,\n  type FormDefinition\n} from '@defra/forms-model'\n\nimport { type FormDefinitionTranslations } from '~/src/server/plugins/engine/i18n/types.js'\n\ntype BaseTranslations = FormDefinitionTranslations[string]\n\nexport function extractBaseTranslations(\n  def: FormDefinition | undefined\n): BaseTranslations {\n  const pages: BaseTranslations['pages'] = {}\n  const components: BaseTranslations['components'] = {}\n  const sections: BaseTranslations['sections'] = {}\n  const listItems: BaseTranslations['listItems'] = {}\n  const form: BaseTranslations['form'] = {}\n\n  if (!def) {\n    return { pages, components, sections, listItems, form }\n  }\n\n  for (const page of def.pages) {\n    if (page.id && page.title) {\n      pages[page.id] = { title: page.title }\n    }\n\n    if (hasComponentsEvenIfNoNext(page)) {\n      for (const component of page.components) {\n        if (!component.id) continue\n\n        const entry: BaseTranslations['components'][string] = {}\n\n        if (component.title) entry.title = component.title\n        if ('hint' in component && component.hint) entry.hint = component.hint\n        if ('content' in component && component.content) {\n          entry.content = component.content\n        }\n        if ('shortDescription' in component && component.shortDescription) {\n          entry.shortDescription = component.shortDescription\n        }\n\n        if (Object.keys(entry).length) {\n          components[component.id] = entry\n        }\n      }\n    }\n  }\n\n  for (const section of def.sections) {\n    if (section.id && section.title) {\n      sections[section.id] = { title: section.title }\n    }\n  }\n\n  for (const list of def.lists) {\n    for (const item of list.items) {\n      if (item.id && item.text) {\n        listItems[item.id] = { text: item.text }\n      }\n    }\n  }\n\n  form.title = def.name ?? ''\n\n  return { pages, components, sections, listItems, form }\n}\n"],"mappings":"AAAA,SACEA,yBAAyB,QAEpB,oBAAoB;AAM3B,OAAO,SAASC,uBAAuBA,CACrCC,GAA+B,EACb;EAClB,MAAMC,KAAgC,GAAG,CAAC,CAAC;EAC3C,MAAMC,UAA0C,GAAG,CAAC,CAAC;EACrD,MAAMC,QAAsC,GAAG,CAAC,CAAC;EACjD,MAAMC,SAAwC,GAAG,CAAC,CAAC;EACnD,MAAMC,IAA8B,GAAG,CAAC,CAAC;EAEzC,IAAI,CAACL,GAAG,EAAE;IACR,OAAO;MAAEC,KAAK;MAAEC,UAAU;MAAEC,QAAQ;MAAEC,SAAS;MAAEC;IAAK,CAAC;EACzD;EAEA,KAAK,MAAMC,IAAI,IAAIN,GAAG,CAACC,KAAK,EAAE;IAC5B,IAAIK,IAAI,CAACC,EAAE,IAAID,IAAI,CAACE,KAAK,EAAE;MACzBP,KAAK,CAACK,IAAI,CAACC,EAAE,CAAC,GAAG;QAAEC,KAAK,EAAEF,IAAI,CAACE;MAAM,CAAC;IACxC;IAEA,IAAIV,yBAAyB,CAACQ,IAAI,CAAC,EAAE;MACnC,KAAK,MAAMG,SAAS,IAAIH,IAAI,CAACJ,UAAU,EAAE;QACvC,IAAI,CAACO,SAAS,CAACF,EAAE,EAAE;QAEnB,MAAMG,KAA6C,GAAG,CAAC,CAAC;QAExD,IAAID,SAAS,CAACD,KAAK,EAAEE,KAAK,CAACF,KAAK,GAAGC,SAAS,CAACD,KAAK;QAClD,IAAI,MAAM,IAAIC,SAAS,IAAIA,SAAS,CAACE,IAAI,EAAED,KAAK,CAACC,IAAI,GAAGF,SAAS,CAACE,IAAI;QACtE,IAAI,SAAS,IAAIF,SAAS,IAAIA,SAAS,CAACG,OAAO,EAAE;UAC/CF,KAAK,CAACE,OAAO,GAAGH,SAAS,CAACG,OAAO;QACnC;QACA,IAAI,kBAAkB,IAAIH,SAAS,IAAIA,SAAS,CAACI,gBAAgB,EAAE;UACjEH,KAAK,CAACG,gBAAgB,GAAGJ,SAAS,CAACI,gBAAgB;QACrD;QAEA,IAAIC,MAAM,CAACC,IAAI,CAACL,KAAK,CAAC,CAACM,MAAM,EAAE;UAC7Bd,UAAU,CAACO,SAAS,CAACF,EAAE,CAAC,GAAGG,KAAK;QAClC;MACF;IACF;EACF;EAEA,KAAK,MAAMO,OAAO,IAAIjB,GAAG,CAACG,QAAQ,EAAE;IAClC,IAAIc,OAAO,CAACV,EAAE,IAAIU,OAAO,CAACT,KAAK,EAAE;MAC/BL,QAAQ,CAACc,OAAO,CAACV,EAAE,CAAC,GAAG;QAAEC,KAAK,EAAES,OAAO,CAACT;MAAM,CAAC;IACjD;EACF;EAEA,KAAK,MAAMU,IAAI,IAAIlB,GAAG,CAACmB,KAAK,EAAE;IAC5B,KAAK,MAAMC,IAAI,IAAIF,IAAI,CAACG,KAAK,EAAE;MAC7B,IAAID,IAAI,CAACb,EAAE,IAAIa,IAAI,CAACE,IAAI,EAAE;QACxBlB,SAAS,CAACgB,IAAI,CAACb,EAAE,CAAC,GAAG;UAAEe,IAAI,EAAEF,IAAI,CAACE;QAAK,CAAC;MAC1C;IACF;EACF;EAEAjB,IAAI,CAACG,KAAK,GAAGR,GAAG,CAACuB,IAAI,IAAI,EAAE;EAE3B,OAAO;IAAEtB,KAAK;IAAEC,UAAU;IAAEC,QAAQ;IAAEC,SAAS;IAAEC;EAAK,CAAC;AACzD","ignoreList":[]}

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

@@ -0,0 +1,13 @@
+import { type FormMetadata, type FormStatus } from '@defra/forms-model';
+import { type Translator } from '../../../../server/plugins/engine/i18n/types.js';
+import { type AnyFormRequest } from '../../../../server/plugins/engine/types.js';
+/**
+ * Get translator for plugin, for the current form's metadata (as well as the plugin-specific boilerplate).
+ * This is an async call so we can read the form definition inside this call.
+ * See docs/features/multi-language.md for the language and translation flow overview.
+ * @param {AnyFormRequest} request
+ * @param {FormMetadata} metadata - the metadata of the form
+ * @param {FormStatus} status - the form status to use when retrieving the definition
+ * @param {string} language - the language to use for the translator
+ */
+export declare function getCachedPluginTranslator(request: AnyFormRequest, metadata: FormMetadata, status: FormStatus, language: string): Promise<Translator>;

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

@@ -0,0 +1,35 @@
+import Boom from '@hapi/boom';
+import { LRUCache } from 'lru-cache';
+import { getPluginOptions } from "../helpers.js";
+import { createFormTranslator } from "./createFormTranslator.js";
+const cache = new LRUCache({
+  max: 100,
+  ttl: 1000 * 60 * 15 // 15 minutes
+});
+
+/**
+ * Get translator for plugin, for the current form's metadata (as well as the plugin-specific boilerplate).
+ * This is an async call so we can read the form definition inside this call.
+ * See docs/features/multi-language.md for the language and translation flow overview.
+ * @param {AnyFormRequest} request
+ * @param {FormMetadata} metadata - the metadata of the form
+ * @param {FormStatus} status - the form status to use when retrieving the definition
+ * @param {string} language - the language to use for the translator
+ */
+export async function getCachedPluginTranslator(request, metadata, status, language) {
+  const key = `${metadata.id}-${status}-${language}-plugin-meta`;
+  if (cache.has(key)) {
+    return cache.get(key);
+  }
+  const {
+    services
+  } = getPluginOptions(request.server);
+  const definition = await services?.formsService.getFormDefinition(metadata.id, status);
+  if (!definition) {
+    throw Boom.notFound(`FormDefinition not found for form ${metadata.id} and status ${status}`);
+  }
+  const translator = createFormTranslator(metadata, definition, language);
+  cache.set(key, translator);
+  return translator;
+}
+//# sourceMappingURL=form.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"form.js","names":["Boom","LRUCache","getPluginOptions","createFormTranslator","cache","max","ttl","getCachedPluginTranslator","request","metadata","status","language","key","id","has","get","services","server","definition","formsService","getFormDefinition","notFound","translator","set"],"sources":["../../../../../src/server/plugins/engine/i18n/form.ts"],"sourcesContent":["import { type FormMetadata, type FormStatus } from '@defra/forms-model'\nimport Boom from '@hapi/boom'\nimport { LRUCache } from 'lru-cache'\n\nimport { getPluginOptions } from '~/src/server/plugins/engine/helpers.js'\nimport { createFormTranslator } from '~/src/server/plugins/engine/i18n/createFormTranslator.js'\nimport { type Translator } from '~/src/server/plugins/engine/i18n/types.js'\nimport { type AnyFormRequest } from '~/src/server/plugins/engine/types.js'\n\nconst cache = new LRUCache({\n  max: 100,\n  ttl: 1000 * 60 * 15 // 15 minutes\n})\n\n/**\n * Get translator for plugin, for the current form's metadata (as well as the plugin-specific boilerplate).\n * This is an async call so we can read the form definition inside this call.\n * See docs/features/multi-language.md for the language and translation flow overview.\n * @param {AnyFormRequest} request\n * @param {FormMetadata} metadata - the metadata of the form\n * @param {FormStatus} status - the form status to use when retrieving the definition\n * @param {string} language - the language to use for the translator\n */\nexport async function getCachedPluginTranslator(\n  request: AnyFormRequest,\n  metadata: FormMetadata,\n  status: FormStatus,\n  language: string\n) {\n  const key = `${metadata.id}-${status}-${language}-plugin-meta`\n\n  if (cache.has(key)) {\n    return cache.get(key) as unknown as Translator\n  }\n\n  const { services } = getPluginOptions(request.server)\n\n  const definition = await services?.formsService.getFormDefinition(\n    metadata.id,\n    status\n  )\n\n  if (!definition) {\n    throw Boom.notFound(\n      `FormDefinition not found for form ${metadata.id} and status ${status}`\n    )\n  }\n\n  const translator = createFormTranslator(metadata, definition, language)\n\n  cache.set(key, translator)\n\n  return translator\n}\n"],"mappings":"AACA,OAAOA,IAAI,MAAM,YAAY;AAC7B,SAASC,QAAQ,QAAQ,WAAW;AAEpC,SAASC,gBAAgB;AACzB,SAASC,oBAAoB;AAI7B,MAAMC,KAAK,GAAG,IAAIH,QAAQ,CAAC;EACzBI,GAAG,EAAE,GAAG;EACRC,GAAG,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;AACtB,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,yBAAyBA,CAC7CC,OAAuB,EACvBC,QAAsB,EACtBC,MAAkB,EAClBC,QAAgB,EAChB;EACA,MAAMC,GAAG,GAAG,GAAGH,QAAQ,CAACI,EAAE,IAAIH,MAAM,IAAIC,QAAQ,cAAc;EAE9D,IAAIP,KAAK,CAACU,GAAG,CAACF,GAAG,CAAC,EAAE;IAClB,OAAOR,KAAK,CAACW,GAAG,CAACH,GAAG,CAAC;EACvB;EAEA,MAAM;IAAEI;EAAS,CAAC,GAAGd,gBAAgB,CAACM,OAAO,CAACS,MAAM,CAAC;EAErD,MAAMC,UAAU,GAAG,MAAMF,QAAQ,EAAEG,YAAY,CAACC,iBAAiB,CAC/DX,QAAQ,CAACI,EAAE,EACXH,MACF,CAAC;EAED,IAAI,CAACQ,UAAU,EAAE;IACf,MAAMlB,IAAI,CAACqB,QAAQ,CACjB,qCAAqCZ,QAAQ,CAACI,EAAE,eAAeH,MAAM,EACvE,CAAC;EACH;EAEA,MAAMY,UAAU,GAAGnB,oBAAoB,CAACM,QAAQ,EAAES,UAAU,EAAEP,QAAQ,CAAC;EAEvEP,KAAK,CAACmB,GAAG,CAACX,GAAG,EAAEU,UAAU,CAAC;EAE1B,OAAOA,UAAU;AACnB","ignoreList":[]}

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

@@ -0,0 +1,10 @@
+import { type FormDefinition } from '@defra/forms-model';
+/**
+ * Return a list of available languages.
+ * Empty array if only English, or an array of English and Welsh if translations have been defined.
+ * @param {FormDefinition} def
+ */
+export declare function getAvailableLanguages(def: FormDefinition): {
+    name: string;
+    code: string;
+}[];

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

@@ -0,0 +1,19 @@
+/**
+ * Return a list of available languages.
+ * Empty array if only English, or an array of English and Welsh if translations have been defined.
+ * @param {FormDefinition} def
+ */
+export function getAvailableLanguages(def) {
+  // @ts-expect-error - dynamic property
+  if (def.metadata?.translations?.cy) {
+    return [{
+      name: 'English',
+      code: 'en-GB'
+    }, {
+      name: 'Cymraeg',
+      code: 'cy'
+    }];
+  }
+  return [];
+}
+//# sourceMappingURL=languages.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"languages.js","names":["getAvailableLanguages","def","metadata","translations","cy","name","code"],"sources":["../../../../../src/server/plugins/engine/i18n/languages.ts"],"sourcesContent":["import { type FormDefinition } from '@defra/forms-model'\n\n/**\n * Return a list of available languages.\n * Empty array if only English, or an array of English and Welsh if translations have been defined.\n * @param {FormDefinition} def\n */\nexport function getAvailableLanguages(\n  def: FormDefinition\n): { name: string; code: string }[] {\n  // @ts-expect-error - dynamic property\n  if (def.metadata?.translations?.cy) {\n    return [\n      { name: 'English', code: 'en-GB' },\n      { name: 'Cymraeg', code: 'cy' }\n    ]\n  }\n  return []\n}\n"],"mappings":"AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CACnCC,GAAmB,EACe;EAClC;EACA,IAAIA,GAAG,CAACC,QAAQ,EAAEC,YAAY,EAAEC,EAAE,EAAE;IAClC,OAAO,CACL;MAAEC,IAAI,EAAE,SAAS;MAAEC,IAAI,EAAE;IAAQ,CAAC,EAClC;MAAED,IAAI,EAAE,SAAS;MAAEC,IAAI,EAAE;IAAK,CAAC,CAChC;EACH;EACA,OAAO,EAAE;AACX","ignoreList":[]}

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

@@ -14,7 +14,17 @@
     "numberInteger": "Rhaid i {{#label}} fod yn rhif cyfan",
     "numberMin": "Rhaid i {{#label}} fod yn {{#limit}} neu uwch",
     "numberMax": "Rhaid i {{#label}} fod yn {{#limit}} neu is",
-    "maxWords": "Rhaid i {{#label}} fod yn {{#limit}} o eiriau neu lai"
+    "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"
   },
 
   "errors": {
@@ -29,7 +39,14 @@
     "continue": "Parhau",
     "saveAndExit": "Cadw a gadael",
     "draft": "ddrafft",
-    "live": "fyw"
+    "live": "fyw",
+    "or": "neu",
+    "and": "a",
+    "england": "Lloegr",
+    "wales": "Cymru",
+    "northernIreland": "Gogledd Iwerddon",
+    "scotland": "Yr Alban",
+    "sendFeedback": "Anfon adborth"
   },
 
   "pages": {
@@ -60,6 +77,12 @@
       "totalAmount": "Cyfanswm",
       "reference": "Cyfeirnod",
       "dateOfPayment": "Dyddiad talu",
+      "fileUpload_zero": "Ni uwchlwythwyd unrhyw ffeiliau",
+      "fileUpload_one": "Uwchlwythwyd [[count]] ffeil",
+      "fileUpload_two": "Uwchlwythwyd dwy feil",
+      "fileUpload_few": "Uwchlwythwyd [[count]] ffeil",
+      "fileUpload_many": "Uwchlwythwyd [[count]] o ffeiliau",
+      "fileUpload_other": "Uwchlwythwyd [[count]] ffeil",
       "submissionFailed": "Roedd problem ac ni chyflwynwyd eich ffurflen. Ceisiwch gyflwyno'r ffurflen eto",
       "submissionFailedContactSuffix": " neu gallwch [[contactUsLink]] a dyfynnu'ch cyfeirnod i drefnu ad-daliad",
       "contactUsLinkText": "cysylltu â ni (yn agor mewn tab newydd)",
@@ -79,17 +102,34 @@
       "change": "Newid",
       "notProvided": "Heb ei ddarparu",
       "visuallyHiddenItem": "eitem [[index]]",
+      "pageTitle_zero": "Nid ydych wedi ychwanegu unrhyw atebion",
       "pageTitle_one": "Rydych wedi ychwanegu [[count]] ateb",
+      "pageTitle_two": "Rydych wedi ychwanegu dau ateb",
+      "pageTitle_few": "Rydych wedi ychwanegu [[count]] ateb",
+      "pageTitle_many": "Rydych wedi ychwanegu [[count]] o atebion",
       "pageTitle_other": "Rydych wedi ychwanegu [[count]] ateb",
+      "tooMany_zero": "Ni allwch ychwanegu unrhyw atebion",
       "tooMany_one": "Dim ond hyd at [[count]] ateb y gallwch ei ychwanegu",
+      "tooMany_two": "Dim ond hyd at ddau gateb y gallwch eu hychwanegu",
+      "tooMany_few": "Dim ond hyd at [[count]] ateb y gallwch eu hychwanegu",
+      "tooMany_many": "Dim ond hyd at [[count]] o atebion y gallwch eu hychwanegu",
       "tooMany_other": "Dim ond hyd at [[count]] ateb y gallwch eu hychwanegu",
+      "tooFew_zero": "Rhaid i chi ychwanegu atebion",
       "tooFew_one": "Rhaid i chi ychwanegu o leiaf [[count]] ateb",
+      "tooFew_two": "Rhaid i chi ychwanegu o leiaf ddau gateb",
+      "tooFew_few": "Rhaid i chi ychwanegu o leiaf [[count]] ateb",
+      "tooFew_many": "Rhaid i chi ychwanegu o leiaf [[count]] o atebion",
       "tooFew_other": "Rhaid i chi ychwanegu o leiaf [[count]] ateb"
     },
 
     "fileUpload": {
       "upload": "Uwchlwytho ffeil",
-      "maxFilesReached": "Rydych wedi cyrraedd nifer uchaf y ffeiliau. Tynnwch ffeil i uwchlwytho rhagor."
+      "maxFilesReached": "Rydych wedi cyrraedd nifer uchaf y ffeiliau. Tynnwch ffeil i uwchlwytho rhagor.",
+      "remove": "Tynnu",
+      "removeFileTitle": "Ydych chi'n siŵr eich bod chi eisiau dileu'r ffeil hon?",
+      "removeFileBody": "Ni allwch adfer ffeiliau a dynnwyd.",
+      "removeFileButton": "Dileu ffeil",
+      "cancel": "Canslo"
     },
 
     "exit": {
@@ -111,6 +151,7 @@
         "body": "Os hoffech dderbyn e-bost prawf, [[link]] yr hoffech i gyflwyniadau ffurflen fynd iddo.",
         "linkText": "nodwch y cyfeiriad e-bost (yn agor mewn tab newydd)"
       },
+      "bannerTitle": "Pwysig",
       "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."
@@ -134,7 +175,11 @@
     "findAnAddressInstead": "dod o hyd i gyfeiriad yn lle hynny",
     "noAddressFoundTitle": "Ni chanfuwyd cyfeiriad",
     "noAddressFoundBody": "Ni allem ddod o hyd i gyfeiriad cyfatebol",
+    "addressFound_zero": "Ni chanfuwyd unrhyw gyfeiriadau ar gyfer",
     "addressFound_one": "Canfuwyd [[count]] cyfeiriad ar gyfer",
+    "addressFound_two": "Canfuwyd dau gyfeiriad ar gyfer",
+    "addressFound_few": "Canfuwyd [[count]] chyfeiriad ar gyfer",
+    "addressFound_many": "Canfuwyd [[count]] o gyfeiriadau ar gyfer",
     "addressFound_other": "Canfuwyd [[count]] cyfeiriad ar gyfer",
     "validation": {
       "invalidPostcode": "Nodwch god post dilys neu nodwch gyfeiriad â llaw",
@@ -220,9 +265,9 @@
 
     "yesNoField": {
       "yes": "Ie",
-      "no": "Na",
+      "no": "Nage",
       "validation": {
-        "selectYesNoRequired": "{{#label}} - dewiswch ie neu na"
+        "selectYesNoRequired": "{{#label}} - dewiswch ie neu nage"
       }
     },
 
@@ -236,7 +281,11 @@
     },
 
     "geospatialField": {
+      "added_zero": "Ni ychwanegwyd unrhyw leoliadau",
       "added_one": "Ychwanegwyd [[count]] lleoliad",
+      "added_two": "Ychwanegwyd dau leoliad",
+      "added_few": "Ychwanegwyd [[count]] lleoliad",
+      "added_many": "Ychwanegwyd [[count]] o leoliadau",
       "added_other": "Ychwanegwyd [[count]] lleoliad",
       "validation": {
         "descriptionRequired": "Rhowch ddisgrifiad ar gyfer lleoliad [[count]]",
@@ -245,7 +294,7 @@
     },
 
     "paymentField": {
-      "detailsRequired": "Angen manylion talu",
+      "detailsRequired": "Angen talu",
       "pendingTransaction": "Mae'n bosibl y gwelwch drafodiad ar y gweill yn eich cyfrif banc ond dim ond pan fyddwch yn cyflwyno'r ffurflen y codir tâl arnoch.",
       "addPaymentDetails": "Ychwanegu manylion talu",
       "cannotTakePayment": "Mae problem ac ni allwn dderbyn taliad. Cysylltwch â ni (manylion yn nhroedyn y ffurflen hon) neu cadwch eich cynnydd a dychwelyd at y ffurflen yn ddiweddarach.",
@@ -261,11 +310,29 @@
     },
 
     "fileUploadField": {
+      "uploading": "Yn uwchlwytho…",
       "uploaded": "Wedi'i uwchlwytho",
       "uploadFailed": "Roedd problem gyda'ch ffeiliau a uwchlwythwyd. Uwchlwythwch nhw eto cyn cyflwyno'r ffurflen.",
       "uploadedFilesHeading": "Ffeiliau a uwchlwythwyd",
+      "filesCount_zero": "Uwchlwythwyd [[count]] o ffeiliau",
       "filesCount_one": "Uwchlwythwyd [[count]] ffeil",
+      "filesCount_two": "Uwchlwythwyd [[count]] ffeil",
+      "filesCount_few": "Uwchlwythwyd [[count]] ffeil",
+      "filesCount_many": "Uwchlwythwyd [[count]] o ffeiliau",
       "filesCount_other": "Uwchlwythwyd [[count]] ffeil"
+    },
+
+    "characterCount": {
+      "_comment": "Note the use of %{count} instead of [[count]]. This is because we are passing to the govuk template, not passing to Joi",
+      "underLimit": {
+        "one": "Mae gennych %{count} nod ar ôl",
+        "other": "Mae gennych %{count} nod ar ôl"
+      },
+      "atLimit": "Mae gennych 0 nod ar ôl",
+      "overLimit": {
+        "one": "Mae gennych %{count} nod yn ormod",
+        "other": "Mae gennych %{count} nod yn ormod"
+      }
     }
   }
 }