@defra/forms-engine-plugin 2.1.0 → 2.1.2

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

@@ -57,9 +57,9 @@ function findOrCreateSummaryList(form, fileCountP) {
   if (!summaryList) {
     summaryList = document.createElement('dl');
     summaryList.className = 'govuk-summary-list govuk-summary-list--long-key';
-    const continueButton = form.querySelector('.govuk-button');
-    if (continueButton) {
-      form.insertBefore(summaryList, continueButton);
+    const buttonGroup = form.querySelector('.govuk-button-group');
+    if (buttonGroup) {
+      form.insertBefore(summaryList, buttonGroup);
     } else {
       form.insertBefore(summaryList, fileCountP.nextSibling);
     }

package/.server/client/javascripts/file-upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-upload.js","names":["MAX_POLLING_DURATION","ARIA_DESCRIBEDBY","ERROR_SUMMARY_TITLE_ID","createOrUpdateStatusAnnouncer","form","fileCountP","statusAnnouncer","querySelector","document","createElement","id","className","setAttribute","addStatusAnnouncerToDOM","asHTMLElement","appendChild","body","nextSibling","parentNode","insertBefore","parentElement","findOrCreateSummaryList","summaryList","continueButton","createFileRow","selectedFile","statusText","row","name","innerHTML","renderSummary","container","getElementById","uploadForm","closest","HTMLFormElement","fileInput","existingRow","remove","firstChild","textContent","showError","message","errorSummary","topErrorSummary","titleElement","removeAttribute","formGroup","classList","add","inputId","errorMessage","element","reloadPage","window","history","replaceState","location","href","pathname","buildUploadStatusUrl","uploadId","pathSegments","split","filter","segment","prefix","length","pollUploadStatus","attempts","interval","setInterval","clearInterval","uploadStatusUrl","fetch","headers","Accept","then","response","ok","Error","json","data","uploadStatus","catch","handleStandardFormSubmission","formElement","uploadButton","focus","setTimeout","disabled","handleAjaxFormSubmission","event","action","preventDefault","formData","FormData","isLocalDev","dataset","proxyUrl","uploadUrl","fetchOptions","method","redirect","mode","initUpload","Array","from","querySelectorAll","find","button","trim","isSubmitting","addEventListener","files","initFileUpload","readyState"],"sources":["../../../src/client/javascripts/file-upload.js"],"sourcesContent":["export const MAX_POLLING_DURATION = 300 // 5 minutes\nconst ARIA_DESCRIBEDBY = 'aria-describedby'\nconst ERROR_SUMMARY_TITLE_ID = 'error-summary-title'\n\n/**\n * Creates or updates status announcer for screen readers\n * @param {HTMLElement | null} form - The form element\n * @param {HTMLElement | null} fileCountP - The file count paragraph element\n * @returns {HTMLElement} The status announcer element\n */\nfunction createOrUpdateStatusAnnouncer(form, fileCountP) {\n  let statusAnnouncer = form?.querySelector('#statusInformation')\n\n  if (!statusAnnouncer) {\n    statusAnnouncer = document.createElement('div')\n    statusAnnouncer.id = 'statusInformation'\n    statusAnnouncer.className = 'govuk-visually-hidden'\n    statusAnnouncer.setAttribute('aria-live', 'polite')\n\n    // multiple fallbacks to ensure the status announcer is always added to the DOM\n    // this helps with cross-browser compatibility and unexpected DOM structures encountered during QA\n    try {\n      addStatusAnnouncerToDOM(\n        asHTMLElement(form),\n        asHTMLElement(fileCountP),\n        asHTMLElement(statusAnnouncer)\n      )\n    } catch {\n      try {\n        form?.appendChild(statusAnnouncer)\n      } catch {\n        document.body.appendChild(statusAnnouncer)\n      }\n    }\n  }\n\n  return /** @type {HTMLElement} */ (statusAnnouncer)\n}\n\n/**\n * Helper function to add the status announcer to the DOM\n * @param {HTMLElement} form - The form element\n * @param {HTMLElement | null} fileCountP - The file count paragraph element\n * @param {HTMLElement} statusAnnouncer - The status announcer element to add\n */\nfunction addStatusAnnouncerToDOM(form, fileCountP, statusAnnouncer) {\n  if (fileCountP?.nextSibling && fileCountP.parentNode === form) {\n    form.insertBefore(statusAnnouncer, fileCountP.nextSibling)\n    return\n  }\n\n  const parentElement = fileCountP?.parentNode ?? form\n  parentElement.appendChild(statusAnnouncer)\n}\n\n/**\n * Finds an existing summary list or creates a new one\n * @param {HTMLFormElement} form - The form element\n * @param {HTMLElement} fileCountP - The file count paragraph element\n * @returns {HTMLElement} The summary list element\n */\nfunction findOrCreateSummaryList(form, fileCountP) {\n  let summaryList = form.querySelector('dl.govuk-summary-list')\n\n  if (!summaryList) {\n    summaryList = document.createElement('dl')\n    summaryList.className = 'govuk-summary-list govuk-summary-list--long-key'\n\n    const continueButton = form.querySelector('.govuk-button')\n\n    if (continueButton) {\n      form.insertBefore(summaryList, continueButton)\n    } else {\n      form.insertBefore(summaryList, fileCountP.nextSibling)\n    }\n  }\n\n  return /** @type {HTMLElement} */ (summaryList)\n}\n\n/**\n * Creates a file row element for the summary list\n * @param {File | null} selectedFile - The selected file\n * @param {string} statusText - The status to display\n * @returns {HTMLElement} The created row element\n */\nfunction createFileRow(selectedFile, statusText) {\n  const row = document.createElement('div')\n  row.className = 'govuk-summary-list__row'\n  row.setAttribute('data-filename', selectedFile?.name ?? '')\n  row.innerHTML = `\n      <dt class=\"govuk-summary-list__key\">\n        ${selectedFile?.name ?? ''}\n      </dt>\n      <dd class=\"govuk-summary-list__value\">\n        <strong class=\"govuk-tag govuk-tag--yellow\">${statusText}</strong>\n      </dd>\n      <dd class=\"govuk-summary-list__actions\">\n      </dd>\n    `\n  return row\n}\n\n/**\n * Renders or updates the file summary box for the selected file\n * @param {File | null} selectedFile - The selected file\n * @param {string} statusText - The status to display\n * @param {HTMLElement} form - The form element\n */\nfunction renderSummary(selectedFile, statusText, form) {\n  const container = document.getElementById('uploadedFilesContainer')\n  const uploadForm = container ? container.closest('form') : null\n\n  if (!uploadForm || !(uploadForm instanceof HTMLFormElement)) {\n    return\n  }\n\n  const fileCountP = uploadForm.querySelector('p.govuk-body')\n\n  if (!fileCountP) {\n    return\n  }\n\n  const statusAnnouncer = createOrUpdateStatusAnnouncer(\n    /** @type {HTMLElement} */ (uploadForm),\n    /** @type {HTMLElement | null} */ (fileCountP)\n  )\n\n  const fileInput = form.querySelector('input[type=\"file\"]')\n\n  if (fileInput) {\n    fileInput.setAttribute(ARIA_DESCRIBEDBY, 'statusInformation')\n  }\n\n  const summaryList = findOrCreateSummaryList(\n    /** @type {HTMLFormElement} */ (uploadForm),\n    /** @type {HTMLElement} */ (fileCountP)\n  )\n\n  const existingRow = document.querySelector(\n    `[data-filename=\"${selectedFile?.name}\"]`\n  )\n\n  if (existingRow) {\n    existingRow.remove()\n  }\n\n  const row = createFileRow(selectedFile, statusText)\n  summaryList.insertBefore(row, summaryList.firstChild)\n  statusAnnouncer.textContent = `${selectedFile?.name ?? ''} ${statusText}`\n}\n\n/**\n * Shows an error message using the GOV.UK error summary component\n * and adds inline error styling to the file input\n * @param {string} message - The error message to display\n * @param {HTMLElement | null} errorSummary - The error summary container\n * @param {HTMLInputElement} fileInput - The file input element\n * @returns {void}\n */\nfunction showError(message, errorSummary, fileInput) {\n  const topErrorSummary = document.querySelector('.govuk-error-summary')\n\n  if (topErrorSummary) {\n    const titleElement = document.getElementById(ERROR_SUMMARY_TITLE_ID)\n    if (titleElement) {\n      fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)\n    } else {\n      fileInput.removeAttribute(ARIA_DESCRIBEDBY)\n    }\n    return\n  }\n\n  if (errorSummary) {\n    errorSummary.innerHTML = `\n        <div class=\"govuk-error-summary\" data-module=\"govuk-error-summary\">\n          <div role=\"alert\">\n            <h2 class=\"govuk-error-summary__title\" id=\"${ERROR_SUMMARY_TITLE_ID}\">\n              There is a problem\n            </h2>\n            <div class=\"govuk-error-summary__body\">\n              <ul class=\"govuk-list govuk-error-summary__list\">\n                <li>\n                  <a href=\"#file-upload\">${message}</a>\n                </li>\n              </ul>\n            </div>\n          </div>\n        </div>\n      `\n\n    fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)\n  }\n\n  const formGroup = fileInput.closest('.govuk-form-group')\n  if (formGroup) {\n    formGroup.classList.add('govuk-form-group--error')\n    fileInput.classList.add('govuk-file-upload--error')\n\n    const inputId = fileInput.id\n    let errorMessage = document.getElementById(`${inputId}-error`)\n\n    if (!errorMessage) {\n      errorMessage = document.createElement('p')\n      errorMessage.id = `${inputId}-error`\n      errorMessage.className = 'govuk-error-message'\n      errorMessage.innerHTML = `<span class=\"govuk-visually-hidden\">Error:</span> ${message}`\n      formGroup.insertBefore(errorMessage, fileInput)\n    }\n\n    fileInput.setAttribute(\n      ARIA_DESCRIBEDBY,\n      `error-summary-title ${inputId}-error`\n    )\n  }\n}\n\n/**\n * Helper to safely convert an Element to HTMLElement\n * @param {Element | null} element - The element to convert\n */\nfunction asHTMLElement(element) {\n  return /** @type {HTMLElement} */ (element)\n}\n\nfunction reloadPage() {\n  window.history.replaceState(null, '', window.location.href)\n  window.location.href = window.location.pathname\n}\n\n/**\n * Build the upload status URL given the current pathname and the upload ID.\n * @param {string} pathname – e.g. window.location.pathname\n * @param {string} uploadId\n * @returns {string} e.g. \"/form/upload-status/abc123\"\n */\nexport function buildUploadStatusUrl(pathname, uploadId) {\n  const pathSegments = pathname.split('/').filter((segment) => segment)\n  const prefix = pathSegments.length > 0 ? `/${pathSegments[0]}` : ''\n  return `${prefix}/upload-status/${uploadId}`\n}\n\n/**\n * Polls the upload status endpoint until the file is ready or timeout occurs\n * @param {string} uploadId - The upload ID to check\n */\nfunction pollUploadStatus(uploadId) {\n  let attempts = 0\n  const interval = setInterval(() => {\n    attempts++\n\n    if (attempts >= MAX_POLLING_DURATION) {\n      clearInterval(interval)\n      reloadPage()\n      return\n    }\n\n    const uploadStatusUrl = buildUploadStatusUrl(\n      window.location.pathname,\n      uploadId\n    )\n\n    fetch(uploadStatusUrl, {\n      headers: {\n        Accept: 'application/json'\n      }\n    })\n      .then((response) => {\n        if (!response.ok) {\n          throw new Error('Network response was not ok')\n        }\n        return response.json()\n      })\n      .then((data) => {\n        if (data.uploadStatus === 'ready') {\n          clearInterval(interval)\n          reloadPage()\n        }\n      })\n      .catch(() => {\n        clearInterval(interval)\n        reloadPage()\n      })\n  }, 1000)\n}\n\n/**\n * Handle standard form submission for file upload\n * @param {HTMLFormElement} formElement - The form element\n * @param {HTMLInputElement} fileInput - The file input element\n * @param {HTMLButtonElement} uploadButton - The upload button\n * @param {HTMLButtonElement} continueButton - The continue button\n * @param {File | null} selectedFile - The selected file\n */\nfunction handleStandardFormSubmission(\n  formElement,\n  fileInput,\n  uploadButton,\n  continueButton,\n  selectedFile\n) {\n  renderSummary(selectedFile, 'Uploading…', formElement)\n\n  fileInput.focus()\n\n  setTimeout(() => {\n    fileInput.disabled = true\n    uploadButton.disabled = true\n    continueButton.disabled = true\n  }, 100)\n}\n\n/**\n * Handle AJAX form submission with upload ID\n * @param {Event} event - The click event\n * @param {HTMLFormElement} formElement - The form element\n * @param {HTMLInputElement} fileInput - The file input element\n * @param {HTMLButtonElement} uploadButton - The upload button\n * @param {HTMLElement | null} errorSummary - The error summary container\n * @param {string | undefined} uploadId - The upload ID\n * @returns {boolean} Whether the event was handled\n */\nfunction handleAjaxFormSubmission(\n  event,\n  formElement,\n  fileInput,\n  uploadButton,\n  errorSummary,\n  uploadId\n) {\n  if (!formElement.action || !uploadId) {\n    return false\n  }\n\n  event.preventDefault()\n\n  const formData = new FormData(formElement)\n  const isLocalDev = !!formElement.dataset.proxyUrl\n  const uploadUrl = formElement.dataset.proxyUrl ?? formElement.action\n\n  const fetchOptions = /** @type {RequestInit} */ ({\n    method: 'POST',\n    body: formData,\n    redirect: isLocalDev ? 'follow' : 'manual' // follow mode if local development with the proxy\n  })\n\n  // no-cors mode if needed local development with the proxy\n  if (isLocalDev) {\n    fetchOptions.mode = 'no-cors'\n  }\n\n  fetch(uploadUrl, fetchOptions)\n    .then(() => {\n      pollUploadStatus(uploadId)\n    })\n    .catch(() => {\n      fileInput.disabled = false\n      uploadButton.disabled = false\n\n      showError(\n        'There was a problem uploading the file',\n        errorSummary,\n        fileInput\n      )\n\n      return null\n    })\n\n  return true\n}\n\nfunction initUpload() {\n  const form = document.querySelector('form:has(input[type=\"file\"])')\n  /** @type {HTMLInputElement | null} */\n  const fileInput = form ? form.querySelector('input[type=\"file\"]') : null\n  /** @type {HTMLButtonElement | null} */\n  const uploadButton = form ? form.querySelector('.upload-file-button') : null\n  const continueButton =\n    /** @type {HTMLButtonElement} */ (\n      Array.from(document.querySelectorAll('button.govuk-button')).find(\n        (button) => button.textContent?.trim() === 'Continue'\n      )\n    ) ?? null\n\n  const errorSummary = document.querySelector('.govuk-error-summary-container')\n\n  if (!form || !fileInput || !uploadButton) {\n    return\n  }\n\n  const formElement = /** @type {HTMLFormElement} */ (form)\n  /** @type {File | null} */\n  let selectedFile = null\n  let isSubmitting = false\n  const uploadId = formElement.dataset.uploadId\n\n  fileInput.addEventListener('change', () => {\n    if (errorSummary) {\n      errorSummary.innerHTML = ''\n    }\n\n    if (fileInput.files && fileInput.files.length > 0) {\n      selectedFile = fileInput.files[0]\n    }\n  })\n\n  uploadButton.addEventListener('click', (event) => {\n    if (!selectedFile) {\n      event.preventDefault()\n      showError(\n        'Select a file',\n        /** @type {HTMLElement | null} */ (errorSummary),\n        fileInput\n      )\n      return\n    }\n\n    if (isSubmitting) {\n      event.preventDefault()\n      return\n    }\n\n    isSubmitting = true\n\n    handleStandardFormSubmission(\n      formElement,\n      fileInput,\n      uploadButton,\n      continueButton,\n      selectedFile\n    )\n\n    handleAjaxFormSubmission(\n      event,\n      formElement,\n      fileInput,\n      uploadButton,\n      /** @type {HTMLElement | null} */ (errorSummary),\n      uploadId\n    )\n  })\n}\n\nexport function initFileUpload() {\n  if (document.readyState === 'loading') {\n    document.addEventListener('DOMContentLoaded', initUpload)\n  } else {\n    initUpload()\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"file-upload.js","names":["MAX_POLLING_DURATION","ARIA_DESCRIBEDBY","ERROR_SUMMARY_TITLE_ID","createOrUpdateStatusAnnouncer","form","fileCountP","statusAnnouncer","querySelector","document","createElement","id","className","setAttribute","addStatusAnnouncerToDOM","asHTMLElement","appendChild","body","nextSibling","parentNode","insertBefore","parentElement","findOrCreateSummaryList","summaryList","buttonGroup","createFileRow","selectedFile","statusText","row","name","innerHTML","renderSummary","container","getElementById","uploadForm","closest","HTMLFormElement","fileInput","existingRow","remove","firstChild","textContent","showError","message","errorSummary","topErrorSummary","titleElement","removeAttribute","formGroup","classList","add","inputId","errorMessage","element","reloadPage","window","history","replaceState","location","href","pathname","buildUploadStatusUrl","uploadId","pathSegments","split","filter","segment","prefix","length","pollUploadStatus","attempts","interval","setInterval","clearInterval","uploadStatusUrl","fetch","headers","Accept","then","response","ok","Error","json","data","uploadStatus","catch","handleStandardFormSubmission","formElement","uploadButton","continueButton","focus","setTimeout","disabled","handleAjaxFormSubmission","event","action","preventDefault","formData","FormData","isLocalDev","dataset","proxyUrl","uploadUrl","fetchOptions","method","redirect","mode","initUpload","Array","from","querySelectorAll","find","button","trim","isSubmitting","addEventListener","files","initFileUpload","readyState"],"sources":["../../../src/client/javascripts/file-upload.js"],"sourcesContent":["export const MAX_POLLING_DURATION = 300 // 5 minutes\nconst ARIA_DESCRIBEDBY = 'aria-describedby'\nconst ERROR_SUMMARY_TITLE_ID = 'error-summary-title'\n\n/**\n * Creates or updates status announcer for screen readers\n * @param {HTMLElement | null} form - The form element\n * @param {HTMLElement | null} fileCountP - The file count paragraph element\n * @returns {HTMLElement} The status announcer element\n */\nfunction createOrUpdateStatusAnnouncer(form, fileCountP) {\n  let statusAnnouncer = form?.querySelector('#statusInformation')\n\n  if (!statusAnnouncer) {\n    statusAnnouncer = document.createElement('div')\n    statusAnnouncer.id = 'statusInformation'\n    statusAnnouncer.className = 'govuk-visually-hidden'\n    statusAnnouncer.setAttribute('aria-live', 'polite')\n\n    // multiple fallbacks to ensure the status announcer is always added to the DOM\n    // this helps with cross-browser compatibility and unexpected DOM structures encountered during QA\n    try {\n      addStatusAnnouncerToDOM(\n        asHTMLElement(form),\n        asHTMLElement(fileCountP),\n        asHTMLElement(statusAnnouncer)\n      )\n    } catch {\n      try {\n        form?.appendChild(statusAnnouncer)\n      } catch {\n        document.body.appendChild(statusAnnouncer)\n      }\n    }\n  }\n\n  return /** @type {HTMLElement} */ (statusAnnouncer)\n}\n\n/**\n * Helper function to add the status announcer to the DOM\n * @param {HTMLElement} form - The form element\n * @param {HTMLElement | null} fileCountP - The file count paragraph element\n * @param {HTMLElement} statusAnnouncer - The status announcer element to add\n */\nfunction addStatusAnnouncerToDOM(form, fileCountP, statusAnnouncer) {\n  if (fileCountP?.nextSibling && fileCountP.parentNode === form) {\n    form.insertBefore(statusAnnouncer, fileCountP.nextSibling)\n    return\n  }\n\n  const parentElement = fileCountP?.parentNode ?? form\n  parentElement.appendChild(statusAnnouncer)\n}\n\n/**\n * Finds an existing summary list or creates a new one\n * @param {HTMLFormElement} form - The form element\n * @param {HTMLElement} fileCountP - The file count paragraph element\n * @returns {HTMLElement} The summary list element\n */\nfunction findOrCreateSummaryList(form, fileCountP) {\n  let summaryList = form.querySelector('dl.govuk-summary-list')\n\n  if (!summaryList) {\n    summaryList = document.createElement('dl')\n    summaryList.className = 'govuk-summary-list govuk-summary-list--long-key'\n\n    const buttonGroup = form.querySelector('.govuk-button-group')\n\n    if (buttonGroup) {\n      form.insertBefore(summaryList, buttonGroup)\n    } else {\n      form.insertBefore(summaryList, fileCountP.nextSibling)\n    }\n  }\n\n  return /** @type {HTMLElement} */ (summaryList)\n}\n\n/**\n * Creates a file row element for the summary list\n * @param {File | null} selectedFile - The selected file\n * @param {string} statusText - The status to display\n * @returns {HTMLElement} The created row element\n */\nfunction createFileRow(selectedFile, statusText) {\n  const row = document.createElement('div')\n  row.className = 'govuk-summary-list__row'\n  row.setAttribute('data-filename', selectedFile?.name ?? '')\n  row.innerHTML = `\n      <dt class=\"govuk-summary-list__key\">\n        ${selectedFile?.name ?? ''}\n      </dt>\n      <dd class=\"govuk-summary-list__value\">\n        <strong class=\"govuk-tag govuk-tag--yellow\">${statusText}</strong>\n      </dd>\n      <dd class=\"govuk-summary-list__actions\">\n      </dd>\n    `\n  return row\n}\n\n/**\n * Renders or updates the file summary box for the selected file\n * @param {File | null} selectedFile - The selected file\n * @param {string} statusText - The status to display\n * @param {HTMLElement} form - The form element\n */\nfunction renderSummary(selectedFile, statusText, form) {\n  const container = document.getElementById('uploadedFilesContainer')\n  const uploadForm = container ? container.closest('form') : null\n\n  if (!uploadForm || !(uploadForm instanceof HTMLFormElement)) {\n    return\n  }\n\n  const fileCountP = uploadForm.querySelector('p.govuk-body')\n\n  if (!fileCountP) {\n    return\n  }\n\n  const statusAnnouncer = createOrUpdateStatusAnnouncer(\n    /** @type {HTMLElement} */ (uploadForm),\n    /** @type {HTMLElement | null} */ (fileCountP)\n  )\n\n  const fileInput = form.querySelector('input[type=\"file\"]')\n\n  if (fileInput) {\n    fileInput.setAttribute(ARIA_DESCRIBEDBY, 'statusInformation')\n  }\n\n  const summaryList = findOrCreateSummaryList(\n    /** @type {HTMLFormElement} */ (uploadForm),\n    /** @type {HTMLElement} */ (fileCountP)\n  )\n\n  const existingRow = document.querySelector(\n    `[data-filename=\"${selectedFile?.name}\"]`\n  )\n\n  if (existingRow) {\n    existingRow.remove()\n  }\n\n  const row = createFileRow(selectedFile, statusText)\n  summaryList.insertBefore(row, summaryList.firstChild)\n  statusAnnouncer.textContent = `${selectedFile?.name ?? ''} ${statusText}`\n}\n\n/**\n * Shows an error message using the GOV.UK error summary component\n * and adds inline error styling to the file input\n * @param {string} message - The error message to display\n * @param {HTMLElement | null} errorSummary - The error summary container\n * @param {HTMLInputElement} fileInput - The file input element\n * @returns {void}\n */\nfunction showError(message, errorSummary, fileInput) {\n  const topErrorSummary = document.querySelector('.govuk-error-summary')\n\n  if (topErrorSummary) {\n    const titleElement = document.getElementById(ERROR_SUMMARY_TITLE_ID)\n    if (titleElement) {\n      fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)\n    } else {\n      fileInput.removeAttribute(ARIA_DESCRIBEDBY)\n    }\n    return\n  }\n\n  if (errorSummary) {\n    errorSummary.innerHTML = `\n        <div class=\"govuk-error-summary\" data-module=\"govuk-error-summary\">\n          <div role=\"alert\">\n            <h2 class=\"govuk-error-summary__title\" id=\"${ERROR_SUMMARY_TITLE_ID}\">\n              There is a problem\n            </h2>\n            <div class=\"govuk-error-summary__body\">\n              <ul class=\"govuk-list govuk-error-summary__list\">\n                <li>\n                  <a href=\"#file-upload\">${message}</a>\n                </li>\n              </ul>\n            </div>\n          </div>\n        </div>\n      `\n\n    fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)\n  }\n\n  const formGroup = fileInput.closest('.govuk-form-group')\n  if (formGroup) {\n    formGroup.classList.add('govuk-form-group--error')\n    fileInput.classList.add('govuk-file-upload--error')\n\n    const inputId = fileInput.id\n    let errorMessage = document.getElementById(`${inputId}-error`)\n\n    if (!errorMessage) {\n      errorMessage = document.createElement('p')\n      errorMessage.id = `${inputId}-error`\n      errorMessage.className = 'govuk-error-message'\n      errorMessage.innerHTML = `<span class=\"govuk-visually-hidden\">Error:</span> ${message}`\n      formGroup.insertBefore(errorMessage, fileInput)\n    }\n\n    fileInput.setAttribute(\n      ARIA_DESCRIBEDBY,\n      `error-summary-title ${inputId}-error`\n    )\n  }\n}\n\n/**\n * Helper to safely convert an Element to HTMLElement\n * @param {Element | null} element - The element to convert\n */\nfunction asHTMLElement(element) {\n  return /** @type {HTMLElement} */ (element)\n}\n\nfunction reloadPage() {\n  window.history.replaceState(null, '', window.location.href)\n  window.location.href = window.location.pathname\n}\n\n/**\n * Build the upload status URL given the current pathname and the upload ID.\n * @param {string} pathname – e.g. window.location.pathname\n * @param {string} uploadId\n * @returns {string} e.g. \"/form/upload-status/abc123\"\n */\nexport function buildUploadStatusUrl(pathname, uploadId) {\n  const pathSegments = pathname.split('/').filter((segment) => segment)\n  const prefix = pathSegments.length > 0 ? `/${pathSegments[0]}` : ''\n  return `${prefix}/upload-status/${uploadId}`\n}\n\n/**\n * Polls the upload status endpoint until the file is ready or timeout occurs\n * @param {string} uploadId - The upload ID to check\n */\nfunction pollUploadStatus(uploadId) {\n  let attempts = 0\n  const interval = setInterval(() => {\n    attempts++\n\n    if (attempts >= MAX_POLLING_DURATION) {\n      clearInterval(interval)\n      reloadPage()\n      return\n    }\n\n    const uploadStatusUrl = buildUploadStatusUrl(\n      window.location.pathname,\n      uploadId\n    )\n\n    fetch(uploadStatusUrl, {\n      headers: {\n        Accept: 'application/json'\n      }\n    })\n      .then((response) => {\n        if (!response.ok) {\n          throw new Error('Network response was not ok')\n        }\n        return response.json()\n      })\n      .then((data) => {\n        if (data.uploadStatus === 'ready') {\n          clearInterval(interval)\n          reloadPage()\n        }\n      })\n      .catch(() => {\n        clearInterval(interval)\n        reloadPage()\n      })\n  }, 1000)\n}\n\n/**\n * Handle standard form submission for file upload\n * @param {HTMLFormElement} formElement - The form element\n * @param {HTMLInputElement} fileInput - The file input element\n * @param {HTMLButtonElement} uploadButton - The upload button\n * @param {HTMLButtonElement} continueButton - The continue button\n * @param {File | null} selectedFile - The selected file\n */\nfunction handleStandardFormSubmission(\n  formElement,\n  fileInput,\n  uploadButton,\n  continueButton,\n  selectedFile\n) {\n  renderSummary(selectedFile, 'Uploading…', formElement)\n\n  fileInput.focus()\n\n  setTimeout(() => {\n    fileInput.disabled = true\n    uploadButton.disabled = true\n    continueButton.disabled = true\n  }, 100)\n}\n\n/**\n * Handle AJAX form submission with upload ID\n * @param {Event} event - The click event\n * @param {HTMLFormElement} formElement - The form element\n * @param {HTMLInputElement} fileInput - The file input element\n * @param {HTMLButtonElement} uploadButton - The upload button\n * @param {HTMLElement | null} errorSummary - The error summary container\n * @param {string | undefined} uploadId - The upload ID\n * @returns {boolean} Whether the event was handled\n */\nfunction handleAjaxFormSubmission(\n  event,\n  formElement,\n  fileInput,\n  uploadButton,\n  errorSummary,\n  uploadId\n) {\n  if (!formElement.action || !uploadId) {\n    return false\n  }\n\n  event.preventDefault()\n\n  const formData = new FormData(formElement)\n  const isLocalDev = !!formElement.dataset.proxyUrl\n  const uploadUrl = formElement.dataset.proxyUrl ?? formElement.action\n\n  const fetchOptions = /** @type {RequestInit} */ ({\n    method: 'POST',\n    body: formData,\n    redirect: isLocalDev ? 'follow' : 'manual' // follow mode if local development with the proxy\n  })\n\n  // no-cors mode if needed local development with the proxy\n  if (isLocalDev) {\n    fetchOptions.mode = 'no-cors'\n  }\n\n  fetch(uploadUrl, fetchOptions)\n    .then(() => {\n      pollUploadStatus(uploadId)\n    })\n    .catch(() => {\n      fileInput.disabled = false\n      uploadButton.disabled = false\n\n      showError(\n        'There was a problem uploading the file',\n        errorSummary,\n        fileInput\n      )\n\n      return null\n    })\n\n  return true\n}\n\nfunction initUpload() {\n  const form = document.querySelector('form:has(input[type=\"file\"])')\n  /** @type {HTMLInputElement | null} */\n  const fileInput = form ? form.querySelector('input[type=\"file\"]') : null\n  /** @type {HTMLButtonElement | null} */\n  const uploadButton = form ? form.querySelector('.upload-file-button') : null\n  const continueButton =\n    /** @type {HTMLButtonElement} */ (\n      Array.from(document.querySelectorAll('button.govuk-button')).find(\n        (button) => button.textContent?.trim() === 'Continue'\n      )\n    ) ?? null\n\n  const errorSummary = document.querySelector('.govuk-error-summary-container')\n\n  if (!form || !fileInput || !uploadButton) {\n    return\n  }\n\n  const formElement = /** @type {HTMLFormElement} */ (form)\n  /** @type {File | null} */\n  let selectedFile = null\n  let isSubmitting = false\n  const uploadId = formElement.dataset.uploadId\n\n  fileInput.addEventListener('change', () => {\n    if (errorSummary) {\n      errorSummary.innerHTML = ''\n    }\n\n    if (fileInput.files && fileInput.files.length > 0) {\n      selectedFile = fileInput.files[0]\n    }\n  })\n\n  uploadButton.addEventListener('click', (event) => {\n    if (!selectedFile) {\n      event.preventDefault()\n      showError(\n        'Select a file',\n        /** @type {HTMLElement | null} */ (errorSummary),\n        fileInput\n      )\n      return\n    }\n\n    if (isSubmitting) {\n      event.preventDefault()\n      return\n    }\n\n    isSubmitting = true\n\n    handleStandardFormSubmission(\n      formElement,\n      fileInput,\n      uploadButton,\n      continueButton,\n      selectedFile\n    )\n\n    handleAjaxFormSubmission(\n      event,\n      formElement,\n      fileInput,\n      uploadButton,\n      /** @type {HTMLElement | null} */ (errorSummary),\n      uploadId\n    )\n  })\n}\n\nexport function initFileUpload() {\n  if (document.readyState === 'loading') {\n    document.addEventListener('DOMContentLoaded', initUpload)\n  } else {\n    initUpload()\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -2,6 +2,7 @@ import { ComponentType, ConditionsModel, ControllerPath, ControllerType, Engine,
 import { add, format } from 'date-fns';
 import { Parser } from 'expr-eval';
 import joi from 'joi';
+import { createLogger } from "../../../common/helpers/logging/logger.js";
 import "../components/YesNoField.js";
 import { hasListFormField } from "../components/helpers.js";
 import { todayAsDateOnly } from "../date-helper.js";
@@ -11,6 +12,7 @@ import { validationOptions as opts } from "../pageControllers/validationOptions.
 import * as defaultServices from "../services/index.js";
 import { FormAction } from "../../../routes/types.js";
 import { merge } from "../../../services/cacheService.js";
+const logger = createLogger();
 export class FormModel {
   /** The runtime engine that should be used */
   engine;
@@ -35,9 +37,10 @@ export class FormModel {
   pageMap;
   componentMap;
   constructor(def, options, services = defaultServices, controllers) {
-    let schema = formDefinitionSchema;
-    if (def.schema === SchemaVersion.V2) {
-      schema = formDefinitionV2Schema;
+    let schema = formDefinitionV2Schema;
+    if (!def.schema || def.schema === SchemaVersion.V1) {
+      logger.warn(`[DEPRECATION NOTICE] Form "${def.name}" constructed with legacy V1 schema. See https://defra.github.io/forms-engine-plugin/schemas/form-definition-schema.html.`);
+      schema = formDefinitionSchema;
     }
     const result = schema.validate(def, {
       abortEarly: false

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

@@ -1 +1 @@
-{"version":3,"file":"FormModel.js","names":["ComponentType","ConditionsModel","ControllerPath","ControllerType","Engine","SchemaVersion","convertConditionWrapperFromV2","formDefinitionSchema","formDefinitionV2Schema","generateConditionAlias","hasComponents","hasRepeater","isConditionWrapperV2","yesNoListId","yesNoListName","add","format","Parser","joi","hasListFormField","todayAsDateOnly","findPage","getError","getPage","setPageTitles","createPage","validationOptions","opts","defaultServices","FormAction","merge","FormModel","engine","schemaVersion","def","lists","sections","name","values","basePath","conditions","pages","services","controllers","pageDefMap","listDefMap","listDefIdMap","componentDefMap","componentDefIdMap","pageMap","componentMap","constructor","options","schema","V2","result","validate","abortEarly","error","structuredClone","value","push","id","V1","title","type","items","text","Map","map","page","path","list","filter","flatMap","components","component","forEach","conditionDef","condition","makeCondition","pageDef","some","controller","Status","collection","makeFilteredSchema","relevantPages","object","required","concat","stateSchema","parser","operators","logical","Object","assign","functions","dateForComparison","timePeriod","timeUnit","displayName","expr","toConditionExpression","fn","evaluationState","ctx","toConditionContext","evaluate","context","conditionId","propertyName","defineProperty","get","from","parse","toExpression","getList","nameOrId","find","getFormContext","request","state","errors","query","currentPath","startPath","getStartPath","isForceAccess","relevantState","payload","getFormDataFromState","paths","data","referenceNumber","getReferenceNumber","validateFormPayload","nextPage","initialiseContext","assignEvaluationState","assignRelevantState","pageStateIsInvalid","getNextPath","validateFormState","assignPaths","key","keys","getContextValueFromState","listFields","fields","field","undefined","YesNoField","hasOptionalItems","item","length","fieldStateIsInvalid","validValues","fieldState","getFormValueFromState","isInvalid","isArray","Array","every","includes","href","getComponentById","componentId","getListById","listId","getConditionById","action","getFormParams","Validate","update","CheckboxesField","formState","getStateFromValidForm","previousPages","relevantPage","model","stripUnknown","errorsState","details","$$__referenceNumber","Error"],"sources":["../../../../../src/server/plugins/engine/models/FormModel.ts"],"sourcesContent":["import {\n  ComponentType,\n  ConditionsModel,\n  ControllerPath,\n  ControllerType,\n  Engine,\n  SchemaVersion,\n  convertConditionWrapperFromV2,\n  formDefinitionSchema,\n  formDefinitionV2Schema,\n  generateConditionAlias,\n  hasComponents,\n  hasRepeater,\n  isConditionWrapperV2,\n  yesNoListId,\n  yesNoListName,\n  type ComponentDef,\n  type ConditionWrapper,\n  type ConditionWrapperV2,\n  type ConditionsModelData,\n  type DateUnits,\n  type FormDefinition,\n  type List,\n  type Page\n} from '@defra/forms-model'\nimport { add, format } from 'date-fns'\nimport { Parser, type Value } from 'expr-eval'\nimport joi from 'joi'\n\nimport { type ListFormComponent } from '~/src/server/plugins/engine/components/ListFormComponent.js'\nimport {} from '~/src/server/plugins/engine/components/YesNoField.js'\nimport {\n  hasListFormField,\n  type Component\n} from '~/src/server/plugins/engine/components/helpers.js'\nimport { todayAsDateOnly } from '~/src/server/plugins/engine/date-helper.js'\nimport {\n  findPage,\n  getError,\n  getPage,\n  setPageTitles\n} from '~/src/server/plugins/engine/helpers.js'\nimport { type ExecutableCondition } from '~/src/server/plugins/engine/models/types.js'\nimport { type PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'\nimport {\n  createPage,\n  type PageControllerClass\n} from '~/src/server/plugins/engine/pageControllers/helpers.js'\nimport { validationOptions as opts } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport * as defaultServices from '~/src/server/plugins/engine/services/index.js'\nimport {\n  type FormContext,\n  type FormContextRequest,\n  type FormState,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport { FormAction } from '~/src/server/routes/types.js'\nimport { merge } from '~/src/server/services/cacheService.js'\nimport { type Services } from '~/src/server/types.js'\n\nexport class FormModel {\n  /** The runtime engine that should be used */\n  engine?: Engine\n\n  schemaVersion: SchemaVersion\n\n  /** the entire form JSON as an object */\n  def: FormDefinition\n\n  lists: FormDefinition['lists']\n  sections: FormDefinition['sections'] = []\n  name: string\n  values: FormDefinition\n  basePath: string\n  conditions: Partial<Record<string, ExecutableCondition>>\n  pages: PageControllerClass[]\n  services: Services\n\n  controllers?: Record<string, typeof PageController>\n  pageDefMap: Map<string, Page>\n\n  listDefMap: Map<string, List>\n  listDefIdMap: Map<string, List>\n\n  componentDefMap: Map<string, ComponentDef>\n  componentDefIdMap: Map<string, ComponentDef>\n\n  pageMap: Map<string, PageControllerClass>\n  componentMap: Map<string, Component>\n\n  constructor(\n    def: typeof this.def,\n    options: { basePath: string },\n    services: Services = defaultServices,\n    controllers?: Record<string, typeof PageController>\n  ) {\n    let schema = formDefinitionSchema\n\n    if (def.schema === SchemaVersion.V2) {\n      schema = formDefinitionV2Schema\n    }\n\n    const result = schema.validate(def, { abortEarly: false })\n\n    if (result.error) {\n      throw result.error\n    }\n\n    // Make a clone of the shallow copy returned\n    // by joi so as not to change the source data.\n    def = structuredClone(result.value)\n\n    // Add default lists\n    def.lists.push({\n      id: def.schema === SchemaVersion.V1 ? yesNoListName : yesNoListId,\n      name: '__yesNo',\n      title: 'Yes/No',\n      type: 'boolean',\n      items: [\n        {\n          id: '02900d42-83d1-4c72-a719-c4e8228952fa',\n          text: 'Yes',\n          value: true\n        },\n        {\n          id: 'f39000eb-c51b-4019-8f82-bbda0423f04d',\n          text: 'No',\n          value: false\n        }\n      ]\n    })\n\n    // Fix up page titles\n    setPageTitles(def)\n\n    this.engine = def.engine\n    this.schemaVersion = def.schema ?? SchemaVersion.V1\n    this.def = def\n    this.lists = def.lists\n    this.sections = def.sections\n    this.name = def.name ?? ''\n    this.values = result.value\n    this.basePath = options.basePath\n    this.conditions = {}\n    this.services = services\n    this.controllers = controllers\n\n    this.pageDefMap = new Map(def.pages.map((page) => [page.path, page]))\n    this.listDefMap = new Map(def.lists.map((list) => [list.name, list]))\n    this.listDefIdMap = new Map(\n      def.lists\n        .filter((list) => list.id) // Skip lists without an ID\n        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style\n        .map((list) => [list.id as string, list])\n    )\n    this.componentDefMap = new Map(\n      def.pages\n        .filter(hasComponents)\n        .flatMap((page) =>\n          page.components.map((component) => [component.name, component])\n        )\n    )\n    this.componentDefIdMap = new Map(\n      def.pages.filter(hasComponents).flatMap((page) =>\n        page.components\n          .filter((component) => component.id) // Skip components without an ID\n          .map((component) => {\n            // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style\n            return [component.id as string, component]\n          })\n      )\n    )\n\n    def.conditions.forEach((conditionDef) => {\n      const condition = this.makeCondition(\n        isConditionWrapperV2(conditionDef)\n          ? convertConditionWrapperFromV2(conditionDef, this)\n          : conditionDef\n      )\n      this.conditions[condition.name] = condition\n    })\n\n    this.pages = def.pages.map((pageDef) => createPage(this, pageDef))\n\n    if (\n      !def.pages.some(\n        ({ controller }) =>\n          // Check for user-provided status page (optional)\n          controller === ControllerType.Status\n      )\n    ) {\n      this.pages.push(\n        createPage(this, {\n          title: 'Form submitted',\n          path: ControllerPath.Status,\n          controller: ControllerType.Status\n        })\n      )\n    }\n\n    this.pageMap = new Map(this.pages.map((page) => [page.path, page]))\n    this.componentMap = new Map(\n      this.pages.flatMap((page) =>\n        page.collection.components.map((component) => [\n          component.name,\n          component\n        ])\n      )\n    )\n  }\n\n  /**\n   * build the entire model schema from individual pages/sections and filter out answers\n   * for pages which are no longer accessible due to an answer that has been changed\n   */\n  makeFilteredSchema(relevantPages: PageControllerClass[]) {\n    // Build the entire model schema\n    // from the individual pages/sections\n    let schema = joi.object<FormSubmissionState>().required()\n\n    relevantPages.forEach((page) => {\n      schema = schema.concat(page.collection.stateSchema)\n    })\n\n    return schema\n  }\n\n  /**\n   * Instantiates a Condition based on {@link ConditionWrapper}\n   * @param condition\n   */\n  makeCondition(condition: ConditionWrapper): ExecutableCondition {\n    const parser = new Parser({\n      operators: {\n        logical: true\n      }\n    })\n\n    Object.assign(parser.functions, {\n      dateForComparison(timePeriod: number, timeUnit: DateUnits) {\n        // The time element must be stripped (hence using startOfDay() which has no time element),\n        // then formatted as YYYY-MM-DD otherwise we can hit time element and BST issues giving the\n        // wrong date to compare against.\n        // Do not use .toISOString() to format the date as that introduces BST errors.\n        return format(\n          add(todayAsDateOnly(), { [timeUnit]: timePeriod }),\n          'yyyy-MM-dd'\n        )\n      }\n    })\n\n    const { name, displayName, value } = condition\n    const expr = this.toConditionExpression(value, parser)\n\n    const fn = (evaluationState: FormState) => {\n      const ctx = this.toConditionContext(evaluationState, this.conditions)\n      try {\n        return expr.evaluate(ctx) as boolean\n      } catch {\n        return false\n      }\n    }\n\n    return {\n      name,\n      displayName,\n      value,\n      expr,\n      fn\n    }\n  }\n\n  toConditionContext(\n    evaluationState: FormState,\n    conditions: Partial<Record<string, ExecutableCondition>>\n  ) {\n    const context = { ...evaluationState }\n\n    for (const conditionId in conditions) {\n      const propertyName =\n        this.schemaVersion === SchemaVersion.V2\n          ? generateConditionAlias(conditionId)\n          : conditionId\n\n      Object.defineProperty(context, propertyName, {\n        get() {\n          return conditions[conditionId]?.fn(evaluationState)\n        }\n      })\n    }\n\n    return context as Extract<Value, Record<string, Value>>\n  }\n\n  toConditionExpression(value: ConditionsModelData, parser: Parser) {\n    const conditions = ConditionsModel.from(value)\n    return parser.parse(conditions.toExpression())\n  }\n\n  getList(nameOrId: string): List | undefined {\n    return this.schemaVersion === SchemaVersion.V1\n      ? this.lists.find((list) => list.name === nameOrId)\n      : this.lists.find((list) => list.id === nameOrId)\n  }\n\n  /**\n   * Form context for the current page\n   */\n  getFormContext(\n    request: FormContextRequest,\n    state: FormState,\n    errors?: FormSubmissionError[]\n  ): FormContext {\n    const { query } = request\n\n    const page = getPage(this, request)\n\n    // Determine form paths\n    const currentPath = page.path\n    const startPath = page.getStartPath()\n\n    // Preview URL direct access is allowed\n    const isForceAccess = 'force' in query\n\n    let context: FormContext = {\n      evaluationState: {},\n      relevantState: {},\n      relevantPages: [],\n      payload: page.getFormDataFromState(request, state),\n      state,\n      paths: [],\n      errors,\n      isForceAccess,\n      data: {},\n      pageDefMap: this.pageDefMap,\n      listDefMap: this.listDefMap,\n      componentDefMap: this.componentDefMap,\n      pageMap: this.pageMap,\n      componentMap: this.componentMap,\n      referenceNumber: getReferenceNumber(state)\n    }\n\n    // Validate current page\n    context = validateFormPayload(request, page, context)\n\n    // Find start page\n    let nextPage = findPage(this, startPath)\n\n    this.initialiseContext(context)\n\n    // Walk form pages from start\n    while (nextPage) {\n      // Add page to context\n      context.relevantPages.push(nextPage)\n\n      this.assignEvaluationState(context, nextPage)\n\n      this.assignRelevantState(context, nextPage)\n\n      // Stop at current page\n      if (\n        this.pageStateIsInvalid(context, nextPage) ||\n        nextPage.path === currentPath\n      ) {\n        break\n      }\n\n      // Apply conditions to determine next page\n      nextPage = findPage(this, nextPage.getNextPath(context))\n    }\n\n    // Validate form state\n    context = validateFormState(request, page, context)\n\n    // Add paths for navigation\n    this.assignPaths(context)\n\n    return context\n  }\n\n  private initialiseContext(context: FormContext) {\n    // For the V2 engine, we need to initialise `evaluationState` to null\n    // for all keys. This is because the current condition evaluation\n    // library (eval-expr) will throw if an expression uses a key that is undefined.\n    if (this.engine === Engine.V2) {\n      for (const page of this.pages) {\n        for (const key of page.keys) {\n          context.evaluationState[key] = null\n        }\n      }\n    }\n  }\n\n  private assignEvaluationState(\n    context: FormContext,\n    page: PageControllerClass\n  ) {\n    const { collection, pageDef } = page\n    // Skip evaluation state for repeater pages\n\n    if (!hasRepeater(pageDef)) {\n      Object.assign(\n        context.evaluationState,\n        collection.getContextValueFromState(context.state)\n      )\n    }\n  }\n\n  private assignRelevantState(context: FormContext, page: PageControllerClass) {\n    // Copy relevant state by expected keys\n    for (const key of page.keys) {\n      if (typeof context.state[key] !== 'undefined') {\n        context.relevantState[key] = context.state[key]\n      }\n    }\n  }\n\n  private pageStateIsInvalid(context: FormContext, page: PageControllerClass) {\n    // Get any list-bound fields on the page\n    const listFields = page.collection.fields.filter(hasListFormField)\n\n    // For each list field that is bound to a list that contains any conditional items,\n    // we need to check any answers are still valid. Do this by evaluating the conditions\n    // and ensuring any current answers are all included in the set of valid answers\n    for (const field of listFields) {\n      const list = field.list\n\n      // Filter out YesNo as they can't be conditional\n      if (list !== undefined && field.type !== ComponentType.YesNoField) {\n        const hasOptionalItems =\n          list.items.filter((item) => item.condition).length > 0\n\n        if (hasOptionalItems) {\n          return this.fieldStateIsInvalid(context, field, list)\n        }\n      }\n    }\n  }\n\n  private fieldStateIsInvalid(\n    context: FormContext,\n    field: ListFormComponent,\n    list: List\n  ) {\n    const { evaluationState, state } = context\n\n    const validValues = list.items\n      .filter((item) =>\n        item.condition\n          ? this.conditions[item.condition]?.fn(evaluationState)\n          : true\n      )\n      .map((item) => item.value)\n\n    // Get the field state\n    const fieldState = field.getFormValueFromState(state)\n\n    if (fieldState !== undefined) {\n      let isInvalid = false\n      const isArray = Array.isArray(fieldState)\n\n      // Check if any saved state value(s) are still valid\n      // and return true if any are invalid\n      if (isArray) {\n        isInvalid = !fieldState.every((item) => validValues.includes(item))\n      } else {\n        isInvalid = !validValues.includes(fieldState)\n      }\n\n      if (isInvalid) {\n        context.errors ??= []\n\n        const text =\n          'Options are different because you changed a previous answer'\n\n        context.errors.push({\n          text,\n          name: field.name,\n          href: `#${field.name}`,\n          path: [`#${field.name}`]\n        })\n      }\n\n      return isInvalid\n    }\n  }\n\n  private assignPaths(context: FormContext) {\n    for (const { keys, path } of context.relevantPages) {\n      context.paths.push(path)\n\n      // Stop at page with errors\n      if (\n        context.errors?.some(({ name, path }) => {\n          return keys.includes(name) || keys.some((key) => path.includes(key))\n        })\n      ) {\n        break\n      }\n    }\n  }\n\n  getComponentById(componentId: string): ComponentDef | undefined {\n    return this.componentDefIdMap.get(componentId)\n  }\n\n  getListById(listId: string): List | undefined {\n    return this.listDefIdMap.get(listId)\n  }\n\n  /**\n   * Returns a condition by its ID. O(n) lookup time.\n   * @param conditionId\n   * @returns\n   */\n  getConditionById(conditionId: string): ConditionWrapperV2 | undefined {\n    return this.def.conditions\n      .filter(isConditionWrapperV2)\n      .find((condition) => condition.id === conditionId)\n  }\n}\n\n/**\n * Validate current page only\n */\nfunction validateFormPayload(\n  request: FormContextRequest,\n  page: PageControllerClass,\n  context: FormContext\n): FormContext {\n  const { collection } = page\n  const { payload, state } = context\n\n  const { action } = page.getFormParams(request)\n\n  // Skip validation GET requests or other actions\n  if (!request.payload || action !== FormAction.Validate) {\n    return context\n  }\n\n  // For checkbox fields missing in the payload (i.e. unchecked),\n  // explicitly set their value to undefined so that any previously\n  // stored value is cleared and required field validation is enforced.\n  const update = { ...request.payload }\n  collection.fields.forEach((field) => {\n    if (\n      field.type === ComponentType.CheckboxesField &&\n      !(field.name in update)\n    ) {\n      update[field.name] = undefined\n    }\n  })\n\n  const { value, errors } = collection.validate({\n    ...payload,\n    ...update\n  })\n\n  // Add sanitised payload (ready to save)\n  const formState = page.getStateFromValidForm(request, state, value)\n\n  return {\n    ...context,\n    payload: merge(payload, value),\n    state: merge(state, formState),\n    errors\n  }\n}\n\n/**\n * Validate entire form state\n */\nfunction validateFormState(\n  request: FormContextRequest,\n  page: PageControllerClass,\n  context: FormContext\n): FormContext {\n  const { errors = [], relevantPages, relevantState } = context\n\n  // Exclude current page\n  const previousPages = relevantPages.filter(\n    (relevantPage) => relevantPage !== page\n  )\n\n  // Validate relevant state\n  const { error } = page.model\n    .makeFilteredSchema(previousPages)\n    .validate(relevantState, { ...opts, stripUnknown: true })\n\n  // Add relevant state errors\n  if (error) {\n    const errorsState = error.details.map(getError)\n    return { ...context, errors: errors.concat(errorsState) }\n  }\n\n  return context\n}\n\nfunction getReferenceNumber(state: FormState): string {\n  if (\n    !state.$$__referenceNumber ||\n    typeof state.$$__referenceNumber !== 'string'\n  ) {\n    throw Error('Reference number not found in form state')\n  }\n\n  return state.$$__referenceNumber\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"FormModel.js","names":["ComponentType","ConditionsModel","ControllerPath","ControllerType","Engine","SchemaVersion","convertConditionWrapperFromV2","formDefinitionSchema","formDefinitionV2Schema","generateConditionAlias","hasComponents","hasRepeater","isConditionWrapperV2","yesNoListId","yesNoListName","add","format","Parser","joi","createLogger","hasListFormField","todayAsDateOnly","findPage","getError","getPage","setPageTitles","createPage","validationOptions","opts","defaultServices","FormAction","merge","logger","FormModel","engine","schemaVersion","def","lists","sections","name","values","basePath","conditions","pages","services","controllers","pageDefMap","listDefMap","listDefIdMap","componentDefMap","componentDefIdMap","pageMap","componentMap","constructor","options","schema","V1","warn","result","validate","abortEarly","error","structuredClone","value","push","id","title","type","items","text","Map","map","page","path","list","filter","flatMap","components","component","forEach","conditionDef","condition","makeCondition","pageDef","some","controller","Status","collection","makeFilteredSchema","relevantPages","object","required","concat","stateSchema","parser","operators","logical","Object","assign","functions","dateForComparison","timePeriod","timeUnit","displayName","expr","toConditionExpression","fn","evaluationState","ctx","toConditionContext","evaluate","context","conditionId","propertyName","V2","defineProperty","get","from","parse","toExpression","getList","nameOrId","find","getFormContext","request","state","errors","query","currentPath","startPath","getStartPath","isForceAccess","relevantState","payload","getFormDataFromState","paths","data","referenceNumber","getReferenceNumber","validateFormPayload","nextPage","initialiseContext","assignEvaluationState","assignRelevantState","pageStateIsInvalid","getNextPath","validateFormState","assignPaths","key","keys","getContextValueFromState","listFields","fields","field","undefined","YesNoField","hasOptionalItems","item","length","fieldStateIsInvalid","validValues","fieldState","getFormValueFromState","isInvalid","isArray","Array","every","includes","href","getComponentById","componentId","getListById","listId","getConditionById","action","getFormParams","Validate","update","CheckboxesField","formState","getStateFromValidForm","previousPages","relevantPage","model","stripUnknown","errorsState","details","$$__referenceNumber","Error"],"sources":["../../../../../src/server/plugins/engine/models/FormModel.ts"],"sourcesContent":["import {\n  ComponentType,\n  ConditionsModel,\n  ControllerPath,\n  ControllerType,\n  Engine,\n  SchemaVersion,\n  convertConditionWrapperFromV2,\n  formDefinitionSchema,\n  formDefinitionV2Schema,\n  generateConditionAlias,\n  hasComponents,\n  hasRepeater,\n  isConditionWrapperV2,\n  yesNoListId,\n  yesNoListName,\n  type ComponentDef,\n  type ConditionWrapper,\n  type ConditionWrapperV2,\n  type ConditionsModelData,\n  type DateUnits,\n  type FormDefinition,\n  type List,\n  type Page\n} from '@defra/forms-model'\nimport { add, format } from 'date-fns'\nimport { Parser, type Value } from 'expr-eval'\nimport joi from 'joi'\n\nimport { createLogger } from '~/src/server/common/helpers/logging/logger.js'\nimport { type ListFormComponent } from '~/src/server/plugins/engine/components/ListFormComponent.js'\nimport {} from '~/src/server/plugins/engine/components/YesNoField.js'\nimport {\n  hasListFormField,\n  type Component\n} from '~/src/server/plugins/engine/components/helpers.js'\nimport { todayAsDateOnly } from '~/src/server/plugins/engine/date-helper.js'\nimport {\n  findPage,\n  getError,\n  getPage,\n  setPageTitles\n} from '~/src/server/plugins/engine/helpers.js'\nimport { type ExecutableCondition } from '~/src/server/plugins/engine/models/types.js'\nimport { type PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'\nimport {\n  createPage,\n  type PageControllerClass\n} from '~/src/server/plugins/engine/pageControllers/helpers.js'\nimport { validationOptions as opts } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'\nimport * as defaultServices from '~/src/server/plugins/engine/services/index.js'\nimport {\n  type FormContext,\n  type FormContextRequest,\n  type FormState,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport { FormAction } from '~/src/server/routes/types.js'\nimport { merge } from '~/src/server/services/cacheService.js'\nimport { type Services } from '~/src/server/types.js'\n\nconst logger = createLogger()\n\nexport class FormModel {\n  /** The runtime engine that should be used */\n  engine?: Engine\n\n  schemaVersion: SchemaVersion\n\n  /** the entire form JSON as an object */\n  def: FormDefinition\n\n  lists: FormDefinition['lists']\n  sections: FormDefinition['sections'] = []\n  name: string\n  values: FormDefinition\n  basePath: string\n  conditions: Partial<Record<string, ExecutableCondition>>\n  pages: PageControllerClass[]\n  services: Services\n\n  controllers?: Record<string, typeof PageController>\n  pageDefMap: Map<string, Page>\n\n  listDefMap: Map<string, List>\n  listDefIdMap: Map<string, List>\n\n  componentDefMap: Map<string, ComponentDef>\n  componentDefIdMap: Map<string, ComponentDef>\n\n  pageMap: Map<string, PageControllerClass>\n  componentMap: Map<string, Component>\n\n  constructor(\n    def: typeof this.def,\n    options: { basePath: string },\n    services: Services = defaultServices,\n    controllers?: Record<string, typeof PageController>\n  ) {\n    let schema = formDefinitionV2Schema\n\n    if (!def.schema || def.schema === SchemaVersion.V1) {\n      logger.warn(\n        `[DEPRECATION NOTICE] Form \"${def.name}\" constructed with legacy V1 schema. See https://defra.github.io/forms-engine-plugin/schemas/form-definition-schema.html.`\n      )\n      schema = formDefinitionSchema\n    }\n\n    const result = schema.validate(def, { abortEarly: false })\n\n    if (result.error) {\n      throw result.error\n    }\n\n    // Make a clone of the shallow copy returned\n    // by joi so as not to change the source data.\n    def = structuredClone(result.value)\n\n    // Add default lists\n    def.lists.push({\n      id: def.schema === SchemaVersion.V1 ? yesNoListName : yesNoListId,\n      name: '__yesNo',\n      title: 'Yes/No',\n      type: 'boolean',\n      items: [\n        {\n          id: '02900d42-83d1-4c72-a719-c4e8228952fa',\n          text: 'Yes',\n          value: true\n        },\n        {\n          id: 'f39000eb-c51b-4019-8f82-bbda0423f04d',\n          text: 'No',\n          value: false\n        }\n      ]\n    })\n\n    // Fix up page titles\n    setPageTitles(def)\n\n    this.engine = def.engine\n    this.schemaVersion = def.schema ?? SchemaVersion.V1\n    this.def = def\n    this.lists = def.lists\n    this.sections = def.sections\n    this.name = def.name ?? ''\n    this.values = result.value\n    this.basePath = options.basePath\n    this.conditions = {}\n    this.services = services\n    this.controllers = controllers\n\n    this.pageDefMap = new Map(def.pages.map((page) => [page.path, page]))\n    this.listDefMap = new Map(def.lists.map((list) => [list.name, list]))\n    this.listDefIdMap = new Map(\n      def.lists\n        .filter((list) => list.id) // Skip lists without an ID\n        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style\n        .map((list) => [list.id as string, list])\n    )\n    this.componentDefMap = new Map(\n      def.pages\n        .filter(hasComponents)\n        .flatMap((page) =>\n          page.components.map((component) => [component.name, component])\n        )\n    )\n    this.componentDefIdMap = new Map(\n      def.pages.filter(hasComponents).flatMap((page) =>\n        page.components\n          .filter((component) => component.id) // Skip components without an ID\n          .map((component) => {\n            // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style\n            return [component.id as string, component]\n          })\n      )\n    )\n\n    def.conditions.forEach((conditionDef) => {\n      const condition = this.makeCondition(\n        isConditionWrapperV2(conditionDef)\n          ? convertConditionWrapperFromV2(conditionDef, this)\n          : conditionDef\n      )\n      this.conditions[condition.name] = condition\n    })\n\n    this.pages = def.pages.map((pageDef) => createPage(this, pageDef))\n\n    if (\n      !def.pages.some(\n        ({ controller }) =>\n          // Check for user-provided status page (optional)\n          controller === ControllerType.Status\n      )\n    ) {\n      this.pages.push(\n        createPage(this, {\n          title: 'Form submitted',\n          path: ControllerPath.Status,\n          controller: ControllerType.Status\n        })\n      )\n    }\n\n    this.pageMap = new Map(this.pages.map((page) => [page.path, page]))\n    this.componentMap = new Map(\n      this.pages.flatMap((page) =>\n        page.collection.components.map((component) => [\n          component.name,\n          component\n        ])\n      )\n    )\n  }\n\n  /**\n   * build the entire model schema from individual pages/sections and filter out answers\n   * for pages which are no longer accessible due to an answer that has been changed\n   */\n  makeFilteredSchema(relevantPages: PageControllerClass[]) {\n    // Build the entire model schema\n    // from the individual pages/sections\n    let schema = joi.object<FormSubmissionState>().required()\n\n    relevantPages.forEach((page) => {\n      schema = schema.concat(page.collection.stateSchema)\n    })\n\n    return schema\n  }\n\n  /**\n   * Instantiates a Condition based on {@link ConditionWrapper}\n   * @param condition\n   */\n  makeCondition(condition: ConditionWrapper): ExecutableCondition {\n    const parser = new Parser({\n      operators: {\n        logical: true\n      }\n    })\n\n    Object.assign(parser.functions, {\n      dateForComparison(timePeriod: number, timeUnit: DateUnits) {\n        // The time element must be stripped (hence using startOfDay() which has no time element),\n        // then formatted as YYYY-MM-DD otherwise we can hit time element and BST issues giving the\n        // wrong date to compare against.\n        // Do not use .toISOString() to format the date as that introduces BST errors.\n        return format(\n          add(todayAsDateOnly(), { [timeUnit]: timePeriod }),\n          'yyyy-MM-dd'\n        )\n      }\n    })\n\n    const { name, displayName, value } = condition\n    const expr = this.toConditionExpression(value, parser)\n\n    const fn = (evaluationState: FormState) => {\n      const ctx = this.toConditionContext(evaluationState, this.conditions)\n      try {\n        return expr.evaluate(ctx) as boolean\n      } catch {\n        return false\n      }\n    }\n\n    return {\n      name,\n      displayName,\n      value,\n      expr,\n      fn\n    }\n  }\n\n  toConditionContext(\n    evaluationState: FormState,\n    conditions: Partial<Record<string, ExecutableCondition>>\n  ) {\n    const context = { ...evaluationState }\n\n    for (const conditionId in conditions) {\n      const propertyName =\n        this.schemaVersion === SchemaVersion.V2\n          ? generateConditionAlias(conditionId)\n          : conditionId\n\n      Object.defineProperty(context, propertyName, {\n        get() {\n          return conditions[conditionId]?.fn(evaluationState)\n        }\n      })\n    }\n\n    return context as Extract<Value, Record<string, Value>>\n  }\n\n  toConditionExpression(value: ConditionsModelData, parser: Parser) {\n    const conditions = ConditionsModel.from(value)\n    return parser.parse(conditions.toExpression())\n  }\n\n  getList(nameOrId: string): List | undefined {\n    return this.schemaVersion === SchemaVersion.V1\n      ? this.lists.find((list) => list.name === nameOrId)\n      : this.lists.find((list) => list.id === nameOrId)\n  }\n\n  /**\n   * Form context for the current page\n   */\n  getFormContext(\n    request: FormContextRequest,\n    state: FormState,\n    errors?: FormSubmissionError[]\n  ): FormContext {\n    const { query } = request\n\n    const page = getPage(this, request)\n\n    // Determine form paths\n    const currentPath = page.path\n    const startPath = page.getStartPath()\n\n    // Preview URL direct access is allowed\n    const isForceAccess = 'force' in query\n\n    let context: FormContext = {\n      evaluationState: {},\n      relevantState: {},\n      relevantPages: [],\n      payload: page.getFormDataFromState(request, state),\n      state,\n      paths: [],\n      errors,\n      isForceAccess,\n      data: {},\n      pageDefMap: this.pageDefMap,\n      listDefMap: this.listDefMap,\n      componentDefMap: this.componentDefMap,\n      pageMap: this.pageMap,\n      componentMap: this.componentMap,\n      referenceNumber: getReferenceNumber(state)\n    }\n\n    // Validate current page\n    context = validateFormPayload(request, page, context)\n\n    // Find start page\n    let nextPage = findPage(this, startPath)\n\n    this.initialiseContext(context)\n\n    // Walk form pages from start\n    while (nextPage) {\n      // Add page to context\n      context.relevantPages.push(nextPage)\n\n      this.assignEvaluationState(context, nextPage)\n\n      this.assignRelevantState(context, nextPage)\n\n      // Stop at current page\n      if (\n        this.pageStateIsInvalid(context, nextPage) ||\n        nextPage.path === currentPath\n      ) {\n        break\n      }\n\n      // Apply conditions to determine next page\n      nextPage = findPage(this, nextPage.getNextPath(context))\n    }\n\n    // Validate form state\n    context = validateFormState(request, page, context)\n\n    // Add paths for navigation\n    this.assignPaths(context)\n\n    return context\n  }\n\n  private initialiseContext(context: FormContext) {\n    // For the V2 engine, we need to initialise `evaluationState` to null\n    // for all keys. This is because the current condition evaluation\n    // library (eval-expr) will throw if an expression uses a key that is undefined.\n    if (this.engine === Engine.V2) {\n      for (const page of this.pages) {\n        for (const key of page.keys) {\n          context.evaluationState[key] = null\n        }\n      }\n    }\n  }\n\n  private assignEvaluationState(\n    context: FormContext,\n    page: PageControllerClass\n  ) {\n    const { collection, pageDef } = page\n    // Skip evaluation state for repeater pages\n\n    if (!hasRepeater(pageDef)) {\n      Object.assign(\n        context.evaluationState,\n        collection.getContextValueFromState(context.state)\n      )\n    }\n  }\n\n  private assignRelevantState(context: FormContext, page: PageControllerClass) {\n    // Copy relevant state by expected keys\n    for (const key of page.keys) {\n      if (typeof context.state[key] !== 'undefined') {\n        context.relevantState[key] = context.state[key]\n      }\n    }\n  }\n\n  private pageStateIsInvalid(context: FormContext, page: PageControllerClass) {\n    // Get any list-bound fields on the page\n    const listFields = page.collection.fields.filter(hasListFormField)\n\n    // For each list field that is bound to a list that contains any conditional items,\n    // we need to check any answers are still valid. Do this by evaluating the conditions\n    // and ensuring any current answers are all included in the set of valid answers\n    for (const field of listFields) {\n      const list = field.list\n\n      // Filter out YesNo as they can't be conditional\n      if (list !== undefined && field.type !== ComponentType.YesNoField) {\n        const hasOptionalItems =\n          list.items.filter((item) => item.condition).length > 0\n\n        if (hasOptionalItems) {\n          return this.fieldStateIsInvalid(context, field, list)\n        }\n      }\n    }\n  }\n\n  private fieldStateIsInvalid(\n    context: FormContext,\n    field: ListFormComponent,\n    list: List\n  ) {\n    const { evaluationState, state } = context\n\n    const validValues = list.items\n      .filter((item) =>\n        item.condition\n          ? this.conditions[item.condition]?.fn(evaluationState)\n          : true\n      )\n      .map((item) => item.value)\n\n    // Get the field state\n    const fieldState = field.getFormValueFromState(state)\n\n    if (fieldState !== undefined) {\n      let isInvalid = false\n      const isArray = Array.isArray(fieldState)\n\n      // Check if any saved state value(s) are still valid\n      // and return true if any are invalid\n      if (isArray) {\n        isInvalid = !fieldState.every((item) => validValues.includes(item))\n      } else {\n        isInvalid = !validValues.includes(fieldState)\n      }\n\n      if (isInvalid) {\n        context.errors ??= []\n\n        const text =\n          'Options are different because you changed a previous answer'\n\n        context.errors.push({\n          text,\n          name: field.name,\n          href: `#${field.name}`,\n          path: [`#${field.name}`]\n        })\n      }\n\n      return isInvalid\n    }\n  }\n\n  private assignPaths(context: FormContext) {\n    for (const { keys, path } of context.relevantPages) {\n      context.paths.push(path)\n\n      // Stop at page with errors\n      if (\n        context.errors?.some(({ name, path }) => {\n          return keys.includes(name) || keys.some((key) => path.includes(key))\n        })\n      ) {\n        break\n      }\n    }\n  }\n\n  getComponentById(componentId: string): ComponentDef | undefined {\n    return this.componentDefIdMap.get(componentId)\n  }\n\n  getListById(listId: string): List | undefined {\n    return this.listDefIdMap.get(listId)\n  }\n\n  /**\n   * Returns a condition by its ID. O(n) lookup time.\n   * @param conditionId\n   * @returns\n   */\n  getConditionById(conditionId: string): ConditionWrapperV2 | undefined {\n    return this.def.conditions\n      .filter(isConditionWrapperV2)\n      .find((condition) => condition.id === conditionId)\n  }\n}\n\n/**\n * Validate current page only\n */\nfunction validateFormPayload(\n  request: FormContextRequest,\n  page: PageControllerClass,\n  context: FormContext\n): FormContext {\n  const { collection } = page\n  const { payload, state } = context\n\n  const { action } = page.getFormParams(request)\n\n  // Skip validation GET requests or other actions\n  if (!request.payload || action !== FormAction.Validate) {\n    return context\n  }\n\n  // For checkbox fields missing in the payload (i.e. unchecked),\n  // explicitly set their value to undefined so that any previously\n  // stored value is cleared and required field validation is enforced.\n  const update = { ...request.payload }\n  collection.fields.forEach((field) => {\n    if (\n      field.type === ComponentType.CheckboxesField &&\n      !(field.name in update)\n    ) {\n      update[field.name] = undefined\n    }\n  })\n\n  const { value, errors } = collection.validate({\n    ...payload,\n    ...update\n  })\n\n  // Add sanitised payload (ready to save)\n  const formState = page.getStateFromValidForm(request, state, value)\n\n  return {\n    ...context,\n    payload: merge(payload, value),\n    state: merge(state, formState),\n    errors\n  }\n}\n\n/**\n * Validate entire form state\n */\nfunction validateFormState(\n  request: FormContextRequest,\n  page: PageControllerClass,\n  context: FormContext\n): FormContext {\n  const { errors = [], relevantPages, relevantState } = context\n\n  // Exclude current page\n  const previousPages = relevantPages.filter(\n    (relevantPage) => relevantPage !== page\n  )\n\n  // Validate relevant state\n  const { error } = page.model\n    .makeFilteredSchema(previousPages)\n    .validate(relevantState, { ...opts, stripUnknown: true })\n\n  // Add relevant state errors\n  if (error) {\n    const errorsState = error.details.map(getError)\n    return { ...context, errors: errors.concat(errorsState) }\n  }\n\n  return context\n}\n\nfunction getReferenceNumber(state: FormState): string {\n  if (\n    !state.$$__referenceNumber ||\n    typeof state.$$__referenceNumber !== 'string'\n  ) {\n    throw Error('Reference number not found in form state')\n  }\n\n  return state.$$__referenceNumber\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -87,9 +87,9 @@
     "btoa": "^1.2.1",
     "convict": "^6.2.4",
     "date-fns": "^4.1.0",
-    "dotenv": "^17.0.1",
+    "dotenv": "^17.2.1",
     "expr-eval": "^2.0.2",
-    "govuk-frontend": "^5.10.2",
+    "govuk-frontend": "^5.11.1",
     "hapi-pino": "^12.1.0",
     "hapi-pulse": "^3.0.1",
     "highlight.js": "^11.11.1",
@@ -103,7 +103,7 @@
     "nunjucks": "^3.2.3",
     "outdent": "^0.8.0",
     "pino": "^9.7.0",
-    "pino-pretty": "^13.0.0",
+    "pino-pretty": "^13.1.1",
     "proxy-agent": "^6.5.0",
     "resolve": "^1.22.10",
     "yaml": "^2.8.0"
@@ -116,23 +116,23 @@
     "@babel/preset-typescript": "^7.27.1",
     "@hapi/basic": "^7.0.2",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/jest-dom": "^6.6.4",
     "@types/atob": "^2.1.4",
     "@types/btoa": "^1.2.5",
     "@types/convict": "^6.1.6",
     "@types/eslint": "^9.6.1",
     "@types/govuk-frontend": "^5.9.0",
     "@types/hapi": "^18.0.14",
-    "@types/hapi__catbox-memory": "^4.1.8",
+    "@types/hapi__catbox-memory": "^6.0.2",
     "@types/hapi__cookie": "^12.0.5",
     "@types/hapi__crumb": "^7.3.7",
     "@types/hapi__yar": "^10.1.6",
     "@types/hoek": "^4.1.7",
     "@types/jest": "^30.0.0",
     "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.17.17",
+    "@types/lodash": "^4.17.20",
     "@types/mysql": "^2.15.27",
-    "@types/node": "^24.0.2",
+    "@types/node": "^24.2.0",
     "@types/nunjucks": "^3.2.6",
     "@types/resolve": "^1.20.6",
     "@types/url-parse": "^1.4.11",
@@ -164,8 +164,8 @@
     "eslint-plugin-promise": "^6.6.0",
     "global-jsdom": "^26.0.0",
     "husky": "^9.1.7",
-    "jest": "^30.0.4",
-    "jest-extended": "^4.0.2",
+    "jest": "^30.0.5",
+    "jest-extended": "^6.0.0",
     "jsdom": "^26.1.0",
     "lint-staged": "^15.3.0",
     "mockdate": "^3.0.5",

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

@@ -66,10 +66,10 @@ function findOrCreateSummaryList(form, fileCountP) {
     summaryList = document.createElement('dl')
     summaryList.className = 'govuk-summary-list govuk-summary-list--long-key'
 
-    const continueButton = form.querySelector('.govuk-button')
+    const buttonGroup = form.querySelector('.govuk-button-group')
 
-    if (continueButton) {
-      form.insertBefore(summaryList, continueButton)
+    if (buttonGroup) {
+      form.insertBefore(summaryList, buttonGroup)
     } else {
       form.insertBefore(summaryList, fileCountP.nextSibling)
     }

package/src/server/plugins/engine/models/FormModel.test.ts

@@ -1,5 +1,6 @@
 import {
   SchemaVersion,
+  formDefinitionSchema,
   formDefinitionV2Schema,
   type FormDefinition
 } from '@defra/forms-model'
@@ -138,6 +139,48 @@ describe('FormModel', () => {
 
       expect(model.schemaVersion).toBe(SchemaVersion.V1)
     })
+
+    it.each([
+      {
+        input: undefined,
+        expected: SchemaVersion.V1,
+        schema: formDefinitionSchema
+      },
+      {
+        input: SchemaVersion.V1,
+        expected: SchemaVersion.V1,
+        schema: formDefinitionSchema
+      },
+      {
+        input: SchemaVersion.V2,
+        expected: SchemaVersion.V2,
+        schema: formDefinitionV2Schema
+      }
+    ])(
+      'assigns $expected to the schema when defined',
+      ({ input, expected, schema }) => {
+        const definitionWithSchema: FormDefinition = {
+          ...definition,
+          schema: input
+        }
+
+        // we just want to test that we're validating the right schema
+        // we don't care about the actual validation logic, this isn't an integration test
+        const spy = jest.spyOn(schema, 'validate').mockReturnValue({
+          value: definitionWithSchema,
+          error: undefined
+        })
+
+        const model = new FormModel(definitionWithSchema, { basePath: 'test' })
+
+        expect(model.schemaVersion).toBe(expected)
+        expect(spy).toHaveBeenCalledWith(definitionWithSchema, {
+          abortEarly: false
+        })
+
+        spy.mockRestore()
+      }
+    )
   })
 
   describe('getFormContext', () => {

package/src/server/plugins/engine/models/FormModel.ts

@@ -27,6 +27,7 @@ import { add, format } from 'date-fns'
 import { Parser, type Value } from 'expr-eval'
 import joi from 'joi'
 
+import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
 import { type ListFormComponent } from '~/src/server/plugins/engine/components/ListFormComponent.js'
 import {} from '~/src/server/plugins/engine/components/YesNoField.js'
 import {
@@ -59,6 +60,8 @@ import { FormAction } from '~/src/server/routes/types.js'
 import { merge } from '~/src/server/services/cacheService.js'
 import { type Services } from '~/src/server/types.js'
 
+const logger = createLogger()
+
 export class FormModel {
   /** The runtime engine that should be used */
   engine?: Engine
@@ -95,10 +98,13 @@ export class FormModel {
     services: Services = defaultServices,
     controllers?: Record<string, typeof PageController>
   ) {
-    let schema = formDefinitionSchema
+    let schema = formDefinitionV2Schema
 
-    if (def.schema === SchemaVersion.V2) {
-      schema = formDefinitionV2Schema
+    if (!def.schema || def.schema === SchemaVersion.V1) {
+      logger.warn(
+        `[DEPRECATION NOTICE] Form "${def.name}" constructed with legacy V1 schema. See https://defra.github.io/forms-engine-plugin/schemas/form-definition-schema.html.`
+      )
+      schema = formDefinitionSchema
     }
 
     const result = schema.validate(def, { abortEarly: false })