@defra/forms-engine-plugin 0.1.11 → 0.1.12

package/.server/server/plugins/nunjucks/context.js

@@ -5,8 +5,7 @@ import { StatusCodes } from 'http-status-codes';
 import pkg from "../../../../package.json" with { type: 'json' };
 import { config } from "../../../config/index.js";
 import { createLogger } from "../../common/helpers/logging/logger.js";
-import { PREVIEW_PATH_PREFIX } from "../../constants.js";
-import { encodeUrl, safeGenerateCrumb } from "../engine/helpers.js";
+import { checkFormStatus, encodeUrl, safeGenerateCrumb } from "../engine/helpers.js";
 const logger = createLogger();
 
 /** @type {Record<string, string> | undefined} */
@@ -18,10 +17,12 @@ let webpackManifest;
 export function context(request) {
   const {
     params,
-    path,
     response
   } = request ?? {};
-  const isPreviewMode = path?.startsWith(PREVIEW_PATH_PREFIX);
+  const {
+    isPreview: isPreviewMode,
+    state: formState
+  } = checkFormStatus(params);
 
   // Only add the slug in to the context if the response is OK.
   // Footer meta links are not rendered when the slug is missing.
@@ -54,7 +55,7 @@ export function context(request) {
     },
     crumb: safeGenerateCrumb(request),
     currentPath: `${request.path}${request.url.search}`,
-    previewMode: isPreviewMode ? params?.state : undefined,
+    previewMode: isPreviewMode ? formState : undefined,
     slug: isResponseOK ? params?.slug : undefined
   };
   return ctx;

package/.server/server/plugins/nunjucks/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","names":["readFileSync","basename","join","Boom","StatusCodes","pkg","type","config","createLogger","PREVIEW_PATH_PREFIX","encodeUrl","safeGenerateCrumb","logger","webpackManifest","context","request","params","path","response","isPreviewMode","startsWith","isResponseOK","isBoom","statusCode","OK","pluginStorage","server","plugins","consumerViewContext","Error","baseLayoutPath","viewContext","ctx","appVersion","version","cdpEnvironment","get","designerUrl","feedbackLink","phaseTag","serviceName","serviceVersion","crumb","currentPath","url","search","previewMode","state","undefined","slug","devtoolContext","manifestPath","JSON","parse","error","assetPath","getDxtAssetPath","asset"],"sources":["../../../../src/server/plugins/nunjucks/context.js"],"sourcesContent":["import { readFileSync } from 'node:fs'\nimport { basename, join } from 'node:path'\n\nimport Boom from '@hapi/boom'\nimport { StatusCodes } from 'http-status-codes'\n\nimport pkg from '~/package.json' with { type: 'json' }\nimport { config } from '~/src/config/index.js'\nimport { createLogger } from '~/src/server/common/helpers/logging/logger.js'\nimport { PREVIEW_PATH_PREFIX } from '~/src/server/constants.js'\nimport {\n  encodeUrl,\n  safeGenerateCrumb\n} from '~/src/server/plugins/engine/helpers.js'\n\nconst logger = createLogger()\n\n/** @type {Record<string, string> | undefined} */\nlet webpackManifest\n\n/**\n * @param {FormRequest | FormRequestPayload | null} request\n */\nexport function context(request) {\n  const { params, path, response } = request ?? {}\n\n  const isPreviewMode = path?.startsWith(PREVIEW_PATH_PREFIX)\n\n  // Only add the slug in to the context if the response is OK.\n  // Footer meta links are not rendered when the slug is missing.\n  const isResponseOK =\n    !Boom.isBoom(response) && response?.statusCode === StatusCodes.OK\n\n  const pluginStorage = request?.server.plugins['forms-engine-plugin']\n  let consumerViewContext = {}\n\n  if (!pluginStorage) {\n    throw Error('context called before plugin registered')\n  }\n\n  if (!pluginStorage.baseLayoutPath) {\n    throw Error('Missing baseLayoutPath in plugin.options.nunjucks')\n  }\n\n  if ('viewContext' in pluginStorage) {\n    consumerViewContext = pluginStorage.viewContext(request)\n  }\n\n  /** @type {ViewContext} */\n  const ctx = {\n    // take consumers props first so we can override it\n    ...consumerViewContext,\n    baseLayoutPath: pluginStorage.baseLayoutPath,\n    appVersion: pkg.version,\n    config: {\n      cdpEnvironment: config.get('cdpEnvironment'),\n      designerUrl: config.get('designerUrl'),\n      feedbackLink: encodeUrl(config.get('feedbackLink')),\n      phaseTag: config.get('phaseTag'),\n      serviceName: config.get('serviceName'),\n      serviceVersion: config.get('serviceVersion')\n    },\n    crumb: safeGenerateCrumb(request),\n    currentPath: `${request.path}${request.url.search}`,\n    previewMode: isPreviewMode ? params?.state : undefined,\n    slug: isResponseOK ? params?.slug : undefined\n  }\n\n  return ctx\n}\n\n/**\n * Returns the context for the devtool. Consumers won't have access to this.\n */\nexport function devtoolContext() {\n  const manifestPath = join(config.get('publicDir'), 'assets-manifest.json')\n\n  if (!webpackManifest) {\n    try {\n      // eslint-disable-next-line -- Allow JSON type 'any'\n      webpackManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'))\n    } catch {\n      logger.error(`Webpack ${basename(manifestPath)} not found`)\n    }\n  }\n\n  return {\n    assetPath: '/assets',\n    getDxtAssetPath: (asset = '') => {\n      return `/${webpackManifest?.[asset] ?? asset}`\n    }\n  }\n}\n\n/**\n * @import { ViewContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormRequest, FormRequestPayload } from '~/src/server/routes/types.js'\n */\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"context.js","names":["readFileSync","basename","join","Boom","StatusCodes","pkg","type","config","createLogger","checkFormStatus","encodeUrl","safeGenerateCrumb","logger","webpackManifest","context","request","params","response","isPreview","isPreviewMode","state","formState","isResponseOK","isBoom","statusCode","OK","pluginStorage","server","plugins","consumerViewContext","Error","baseLayoutPath","viewContext","ctx","appVersion","version","cdpEnvironment","get","designerUrl","feedbackLink","phaseTag","serviceName","serviceVersion","crumb","currentPath","path","url","search","previewMode","undefined","slug","devtoolContext","manifestPath","JSON","parse","error","assetPath","getDxtAssetPath","asset"],"sources":["../../../../src/server/plugins/nunjucks/context.js"],"sourcesContent":["import { readFileSync } from 'node:fs'\nimport { basename, join } from 'node:path'\n\nimport Boom from '@hapi/boom'\nimport { StatusCodes } from 'http-status-codes'\n\nimport pkg from '~/package.json' with { type: 'json' }\nimport { config } from '~/src/config/index.js'\nimport { createLogger } from '~/src/server/common/helpers/logging/logger.js'\nimport {\n  checkFormStatus,\n  encodeUrl,\n  safeGenerateCrumb\n} from '~/src/server/plugins/engine/helpers.js'\n\nconst logger = createLogger()\n\n/** @type {Record<string, string> | undefined} */\nlet webpackManifest\n\n/**\n * @param {FormRequest | FormRequestPayload | null} request\n */\nexport function context(request) {\n  const { params, response } = request ?? {}\n\n  const { isPreview: isPreviewMode, state: formState } = checkFormStatus(params)\n\n  // Only add the slug in to the context if the response is OK.\n  // Footer meta links are not rendered when the slug is missing.\n  const isResponseOK =\n    !Boom.isBoom(response) && response?.statusCode === StatusCodes.OK\n\n  const pluginStorage = request?.server.plugins['forms-engine-plugin']\n  let consumerViewContext = {}\n\n  if (!pluginStorage) {\n    throw Error('context called before plugin registered')\n  }\n\n  if (!pluginStorage.baseLayoutPath) {\n    throw Error('Missing baseLayoutPath in plugin.options.nunjucks')\n  }\n\n  if ('viewContext' in pluginStorage) {\n    consumerViewContext = pluginStorage.viewContext(request)\n  }\n\n  /** @type {ViewContext} */\n  const ctx = {\n    // take consumers props first so we can override it\n    ...consumerViewContext,\n    baseLayoutPath: pluginStorage.baseLayoutPath,\n    appVersion: pkg.version,\n    config: {\n      cdpEnvironment: config.get('cdpEnvironment'),\n      designerUrl: config.get('designerUrl'),\n      feedbackLink: encodeUrl(config.get('feedbackLink')),\n      phaseTag: config.get('phaseTag'),\n      serviceName: config.get('serviceName'),\n      serviceVersion: config.get('serviceVersion')\n    },\n    crumb: safeGenerateCrumb(request),\n    currentPath: `${request.path}${request.url.search}`,\n    previewMode: isPreviewMode ? formState : undefined,\n    slug: isResponseOK ? params?.slug : undefined\n  }\n\n  return ctx\n}\n\n/**\n * Returns the context for the devtool. Consumers won't have access to this.\n */\nexport function devtoolContext() {\n  const manifestPath = join(config.get('publicDir'), 'assets-manifest.json')\n\n  if (!webpackManifest) {\n    try {\n      // eslint-disable-next-line -- Allow JSON type 'any'\n      webpackManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'))\n    } catch {\n      logger.error(`Webpack ${basename(manifestPath)} not found`)\n    }\n  }\n\n  return {\n    assetPath: '/assets',\n    getDxtAssetPath: (asset = '') => {\n      return `/${webpackManifest?.[asset] ?? asset}`\n    }\n  }\n}\n\n/**\n * @import { ViewContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormRequest, FormRequestPayload } from '~/src/server/routes/types.js'\n */\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/nunjucks/enviroment.test.js

@@ -75,7 +75,8 @@ describe('Nunjucks environment', () => {
           content: 'Some {{ context.someData }} content'
         }
       };
-      const result = checkComponentTemplates.call(nunjucksCtx, component);
+      const result = /** @type {{ model: { content: string } }} */
+      checkComponentTemplates.call(nunjucksCtx, component);
       expect(helpers.evaluateTemplate).toHaveBeenCalledWith('Some {{ context.someData }} content', formContext);
       expect(result.model.content).toBe('evaluated-Some {{ context.someData }} content');
     });
@@ -98,7 +99,8 @@ describe('Nunjucks environment', () => {
           content: nonStringContent
         }
       };
-      const result = checkComponentTemplates.call(nunjucksCtx, component);
+      const result = /** @type {{ model: { content: string } }} */
+      checkComponentTemplates.call(nunjucksCtx, component);
       expect(helpers.evaluateTemplate).not.toHaveBeenCalled();
       expect(result.model.content).toBe(nonStringContent);
     });
@@ -119,7 +121,8 @@ describe('Nunjucks environment', () => {
           }
         }
       };
-      const result = checkComponentTemplates.call(nunjucksCtx, component);
+      const result = /** @type {{ model: { label?: { text: string } } }} */
+      checkComponentTemplates.call(nunjucksCtx, component);
       expect(helpers.evaluateTemplate).toHaveBeenCalledWith('Label with {{ context.someData }}', formContext);
       expect(result.model.label?.text).toBe('evaluated-Label with {{ context.someData }}');
     });

package/.server/server/plugins/nunjucks/enviroment.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"enviroment.test.js","names":["helpers","environment","describe","checkErrorTemplates","beforeEach","getGlobal","jest","spyOn","mockImplementation","text","afterEach","restoreAllMocks","test","nunjucksCtx","ctx","errors","result","call","expect","toBe","evaluateTemplate","not","toHaveBeenCalled","formContext","someData","context","toHaveBeenCalledTimes","toHaveBeenCalledWith","toEqual","checkComponentTemplates","component","type","isFormComponent","model","content","nonStringContent","some","label","evaluateFunc","template"],"sources":["../../../../src/server/plugins/nunjucks/enviroment.test.js"],"sourcesContent":["import * as helpers from '~/src/server/plugins/engine/helpers.js'\nimport { environment } from '~/src/server/plugins/nunjucks/environment.js'\n\ndescribe('Nunjucks environment', () => {\n  describe('checkErrorTemplates function', () => {\n    /** @type {Function} */\n    let checkErrorTemplates\n\n    beforeEach(() => {\n      checkErrorTemplates = environment.getGlobal('checkErrorTemplates')\n\n      jest\n        .spyOn(helpers, 'evaluateTemplate')\n        .mockImplementation((text) => `evaluated-${text}`)\n    })\n\n    afterEach(() => {\n      jest.restoreAllMocks()\n    })\n\n    test('returns errors unchanged when context is not present', () => {\n      const nunjucksCtx = {\n        ctx: {}\n      }\n\n      const errors = [{ text: 'Error 1' }, { text: 'Error 2' }]\n\n      const result = checkErrorTemplates.call(nunjucksCtx, errors)\n\n      expect(result).toBe(errors)\n      expect(helpers.evaluateTemplate).not.toHaveBeenCalled()\n    })\n\n    test('evaluates error texts when context is present', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const errors = [{ text: 'Error 1' }, { text: 'Error 2' }]\n\n      const result = checkErrorTemplates.call(nunjucksCtx, errors)\n\n      expect(helpers.evaluateTemplate).toHaveBeenCalledTimes(2)\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        'Error 1',\n        formContext\n      )\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        'Error 2',\n        formContext\n      )\n\n      expect(result).toEqual([\n        { text: 'evaluated-Error 1' },\n        { text: 'evaluated-Error 2' }\n      ])\n    })\n  })\n\n  describe('checkComponentTemplates function', () => {\n    /** @type {Function} */\n    let checkComponentTemplates\n\n    beforeEach(() => {\n      checkComponentTemplates = environment.getGlobal('checkComponentTemplates')\n\n      jest\n        .spyOn(helpers, 'evaluateTemplate')\n        .mockImplementation((text) => `evaluated-${text}`)\n    })\n\n    afterEach(() => {\n      jest.restoreAllMocks()\n    })\n\n    test('evaluates string content for Html components', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const component = {\n        type: 'Html',\n        isFormComponent: false,\n        model: {\n          content: 'Some {{ context.someData }} content'\n        }\n      }\n\n      const result = checkComponentTemplates.call(nunjucksCtx, component)\n\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        'Some {{ context.someData }} content',\n        formContext\n      )\n      expect(result.model.content).toBe(\n        'evaluated-Some {{ context.someData }} content'\n      )\n    })\n\n    test('does not evaluate non-string content for Html components', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const nonStringContent = { some: 'object' }\n      const component = {\n        type: 'Html',\n        isFormComponent: false,\n        model: {\n          content: nonStringContent\n        }\n      }\n\n      const result = checkComponentTemplates.call(nunjucksCtx, component)\n\n      expect(helpers.evaluateTemplate).not.toHaveBeenCalled()\n\n      expect(result.model.content).toBe(nonStringContent)\n    })\n\n    test('evaluates label text for form components', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const component = {\n        isFormComponent: true,\n        model: {\n          label: {\n            text: 'Label with {{ context.someData }}'\n          }\n        }\n      }\n\n      const result = checkComponentTemplates.call(nunjucksCtx, component)\n\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        'Label with {{ context.someData }}',\n        formContext\n      )\n\n      expect(result.model.label?.text).toBe(\n        'evaluated-Label with {{ context.someData }}'\n      )\n    })\n  })\n\n  describe('evaluate function', () => {\n    /** @type {Function} */\n    let evaluateFunc\n\n    beforeEach(() => {\n      evaluateFunc = environment.getGlobal('evaluate')\n\n      jest\n        .spyOn(helpers, 'evaluateTemplate')\n        .mockImplementation((text) => `evaluated-${text}`)\n    })\n\n    afterEach(() => {\n      jest.restoreAllMocks()\n    })\n\n    test('evaluates template when context is present', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const template = 'Template with {{ context.someData }}'\n      const result = evaluateFunc.call(nunjucksCtx, template)\n\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        template,\n        formContext\n      )\n      expect(result).toBe('evaluated-Template with {{ context.someData }}')\n    })\n\n    test('returns template unchanged when context is not present', () => {\n      const nunjucksCtx = {\n        ctx: {}\n      }\n\n      const template = 'Template with {{ context.someData }}'\n      const result = evaluateFunc.call(nunjucksCtx, template)\n\n      expect(helpers.evaluateTemplate).not.toHaveBeenCalled()\n\n      expect(result).toBe(template)\n    })\n  })\n})\n\n/*\n * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'\n */\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"enviroment.test.js","names":["helpers","environment","describe","checkErrorTemplates","beforeEach","getGlobal","jest","spyOn","mockImplementation","text","afterEach","restoreAllMocks","test","nunjucksCtx","ctx","errors","result","call","expect","toBe","evaluateTemplate","not","toHaveBeenCalled","formContext","someData","context","toHaveBeenCalledTimes","toHaveBeenCalledWith","toEqual","checkComponentTemplates","component","type","isFormComponent","model","content","nonStringContent","some","label","evaluateFunc","template"],"sources":["../../../../src/server/plugins/nunjucks/enviroment.test.js"],"sourcesContent":["import * as helpers from '~/src/server/plugins/engine/helpers.js'\nimport { environment } from '~/src/server/plugins/nunjucks/environment.js'\n\ndescribe('Nunjucks environment', () => {\n  describe('checkErrorTemplates function', () => {\n    /** @type {Function} */\n    let checkErrorTemplates\n\n    beforeEach(() => {\n      checkErrorTemplates = environment.getGlobal('checkErrorTemplates')\n\n      jest\n        .spyOn(helpers, 'evaluateTemplate')\n        .mockImplementation((text) => `evaluated-${text}`)\n    })\n\n    afterEach(() => {\n      jest.restoreAllMocks()\n    })\n\n    test('returns errors unchanged when context is not present', () => {\n      const nunjucksCtx = {\n        ctx: {}\n      }\n\n      const errors = [{ text: 'Error 1' }, { text: 'Error 2' }]\n\n      const result = checkErrorTemplates.call(nunjucksCtx, errors)\n\n      expect(result).toBe(errors)\n      expect(helpers.evaluateTemplate).not.toHaveBeenCalled()\n    })\n\n    test('evaluates error texts when context is present', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const errors = [{ text: 'Error 1' }, { text: 'Error 2' }]\n\n      const result = checkErrorTemplates.call(nunjucksCtx, errors)\n\n      expect(helpers.evaluateTemplate).toHaveBeenCalledTimes(2)\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        'Error 1',\n        formContext\n      )\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        'Error 2',\n        formContext\n      )\n\n      expect(result).toEqual([\n        { text: 'evaluated-Error 1' },\n        { text: 'evaluated-Error 2' }\n      ])\n    })\n  })\n\n  describe('checkComponentTemplates function', () => {\n    /** @type {Function} */\n    let checkComponentTemplates\n\n    beforeEach(() => {\n      checkComponentTemplates = environment.getGlobal('checkComponentTemplates')\n\n      jest\n        .spyOn(helpers, 'evaluateTemplate')\n        .mockImplementation((text) => `evaluated-${text}`)\n    })\n\n    afterEach(() => {\n      jest.restoreAllMocks()\n    })\n\n    test('evaluates string content for Html components', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const component = {\n        type: 'Html',\n        isFormComponent: false,\n        model: {\n          content: 'Some {{ context.someData }} content'\n        }\n      }\n\n      const result = /** @type {{ model: { content: string } }} */ (\n        checkComponentTemplates.call(nunjucksCtx, component)\n      )\n\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        'Some {{ context.someData }} content',\n        formContext\n      )\n      expect(result.model.content).toBe(\n        'evaluated-Some {{ context.someData }} content'\n      )\n    })\n\n    test('does not evaluate non-string content for Html components', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const nonStringContent = { some: 'object' }\n      const component = {\n        type: 'Html',\n        isFormComponent: false,\n        model: {\n          content: nonStringContent\n        }\n      }\n\n      const result = /** @type {{ model: { content: string } }} */ (\n        checkComponentTemplates.call(nunjucksCtx, component)\n      )\n\n      expect(helpers.evaluateTemplate).not.toHaveBeenCalled()\n\n      expect(result.model.content).toBe(nonStringContent)\n    })\n\n    test('evaluates label text for form components', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const component = {\n        isFormComponent: true,\n        model: {\n          label: {\n            text: 'Label with {{ context.someData }}'\n          }\n        }\n      }\n\n      const result = /** @type {{ model: { label?: { text: string } } }} */ (\n        checkComponentTemplates.call(nunjucksCtx, component)\n      )\n\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        'Label with {{ context.someData }}',\n        formContext\n      )\n\n      expect(result.model.label?.text).toBe(\n        'evaluated-Label with {{ context.someData }}'\n      )\n    })\n  })\n\n  describe('evaluate function', () => {\n    /** @type {Function} */\n    let evaluateFunc\n\n    beforeEach(() => {\n      evaluateFunc = environment.getGlobal('evaluate')\n\n      jest\n        .spyOn(helpers, 'evaluateTemplate')\n        .mockImplementation((text) => `evaluated-${text}`)\n    })\n\n    afterEach(() => {\n      jest.restoreAllMocks()\n    })\n\n    test('evaluates template when context is present', () => {\n      const formContext = { someData: 'some-text' }\n      const nunjucksCtx = {\n        ctx: { context: formContext }\n      }\n\n      const template = 'Template with {{ context.someData }}'\n      const result = evaluateFunc.call(nunjucksCtx, template)\n\n      expect(helpers.evaluateTemplate).toHaveBeenCalledWith(\n        template,\n        formContext\n      )\n      expect(result).toBe('evaluated-Template with {{ context.someData }}')\n    })\n\n    test('returns template unchanged when context is not present', () => {\n      const nunjucksCtx = {\n        ctx: {}\n      }\n\n      const template = 'Template with {{ context.someData }}'\n      const result = evaluateFunc.call(nunjucksCtx, template)\n\n      expect(helpers.evaluateTemplate).not.toHaveBeenCalled()\n\n      expect(result).toBe(template)\n    })\n  })\n})\n\n/*\n * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'\n */\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,8 @@
+import Joi from 'joi';
+export function convertToLanguageMessages(extLanguageMessages) {
+  return extLanguageMessages;
+}
+export function createJoiExpression(expr) {
+  return Joi.expression(expr);
+}
+//# sourceMappingURL=type-utils.js.map

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

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

package/.server/typings/joi/index.d.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.js","names":[],"sources":["../../../src/typings/joi/index.d.ts"],"sourcesContent":["import { type FormPayload } from '~/src/server/plugins/engine/types.ts'\n\ndeclare module 'joi' {\n  interface Context {\n    present?: string[]\n    presentWithLabels?: string[]\n    missing?: string[]\n    missingWithLabels?: string[]\n  }\n\n  /**\n   * Add context types for `object.and` error reports\n   * {@link https://joi.dev/api/?v=17.13.3#objectand}\n   */\n  interface ErrorReportCollection extends ErrorReport {\n    local: Context & {\n      value: FormPayload\n      label?: string\n      title?: string\n    }\n  }\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"index.d.js","names":[],"sources":["../../../src/typings/joi/index.d.ts"],"sourcesContent":["import { type FormPayload } from '~/src/server/plugins/engine/types.ts'\n\ndeclare module 'joi' {\n  interface Context {\n    present?: string[]\n    presentWithLabels?: string[]\n    missing?: string[]\n    missingWithLabels?: string[]\n  }\n\n  /**\n   * Add context types for `object.and` error reports\n   * {@link https://joi.dev/api/?v=17.13.3#objectand}\n   */\n  interface ErrorReportCollection extends ErrorReport {\n    local: Context & {\n      value: FormPayload\n      label?: string\n      title?: string\n    }\n  }\n\n  interface JoiExpressionReturn {\n    render: (p1, p2, p3, p4, p5) => string\n  }\n\n  type JoiExpression = JoiExpressionReturn | string\n\n  type LanguageMessagesExt = Record<string, JoiExpression>\n}\n"],"mappings":"","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -63,7 +63,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@defra/forms-model": "^3.0.438",
+    "@defra/forms-model": "^3.0.441",
     "@defra/hapi-tracing": "^1.0.0",
     "@elastic/ecs-pino-format": "^1.5.0",
     "@hapi/boom": "^10.0.1",
@@ -178,7 +178,7 @@
     "stylelint": "^16.12.0",
     "stylelint-config-gds": "^2.0.0",
     "terser-webpack-plugin": "^5.3.11",
-    "tsx": "^4.19.2",
+    "tsx": "^4.19.3",
     "typescript": "^5.7.2",
     "webpack": "^5.97.1",
     "webpack-assets-manifest": "^5.2.1",

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

@@ -1,4 +1,6 @@
 export const MAX_POLLING_DURATION = 300 // 5 minutes
+const ARIA_DESCRIBEDBY = 'aria-describedby'
+const ERROR_SUMMARY_TITLE_ID = 'error-summary-title'
 
 /**
  * Creates or updates status announcer for screen readers
@@ -127,7 +129,7 @@ function renderSummary(selectedFile, statusText, form) {
   const fileInput = form.querySelector('input[type="file"]')
 
   if (fileInput) {
-    fileInput.setAttribute('aria-describedby', 'statusInformation')
+    fileInput.setAttribute(ARIA_DESCRIBEDBY, 'statusInformation')
   }
 
   const summaryList = findOrCreateSummaryList(
@@ -150,17 +152,30 @@ function renderSummary(selectedFile, statusText, form) {
 
 /**
  * Shows an error message using the GOV.UK error summary component
+ * and adds inline error styling to the file input
  * @param {string} message - The error message to display
  * @param {HTMLElement | null} errorSummary - The error summary container
  * @param {HTMLInputElement} fileInput - The file input element
  * @returns {void}
  */
 function showError(message, errorSummary, fileInput) {
+  const topErrorSummary = document.querySelector('.govuk-error-summary')
+
+  if (topErrorSummary) {
+    const titleElement = document.getElementById(ERROR_SUMMARY_TITLE_ID)
+    if (titleElement) {
+      fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)
+    } else {
+      fileInput.removeAttribute(ARIA_DESCRIBEDBY)
+    }
+    return
+  }
+
   if (errorSummary) {
     errorSummary.innerHTML = `
         <div class="govuk-error-summary" data-module="govuk-error-summary">
           <div role="alert">
-            <h2 class="govuk-error-summary__title" id="error-summary-title">
+            <h2 class="govuk-error-summary__title" id="${ERROR_SUMMARY_TITLE_ID}">
               There is a problem
             </h2>
             <div class="govuk-error-summary__body">
@@ -173,7 +188,30 @@ function showError(message, errorSummary, fileInput) {
           </div>
         </div>
       `
-    fileInput.setAttribute('aria-describedby', 'error-summary-title')
+
+    fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)
+  }
+
+  const formGroup = fileInput.closest('.govuk-form-group')
+  if (formGroup) {
+    formGroup.classList.add('govuk-form-group--error')
+    fileInput.classList.add('govuk-file-upload--error')
+
+    const inputId = fileInput.id
+    let errorMessage = document.getElementById(`${inputId}-error`)
+
+    if (!errorMessage) {
+      errorMessage = document.createElement('p')
+      errorMessage.id = `${inputId}-error`
+      errorMessage.className = 'govuk-error-message'
+      errorMessage.innerHTML = `<span class="govuk-visually-hidden">Error:</span> ${message}`
+      formGroup.insertBefore(errorMessage, fileInput)
+    }
+
+    fileInput.setAttribute(
+      ARIA_DESCRIBEDBY,
+      `error-summary-title ${inputId}-error`
+    )
   }
 }
 
@@ -190,6 +228,18 @@ function reloadPage() {
   window.location.href = window.location.pathname
 }
 
+/**
+ * Build the upload status URL given the current pathname and the upload ID.
+ * @param {string} pathname – e.g. window.location.pathname
+ * @param {string} uploadId
+ * @returns {string} e.g. "/form/upload-status/abc123"
+ */
+export function buildUploadStatusUrl(pathname, uploadId) {
+  const pathSegments = pathname.split('/').filter((segment) => segment)
+  const prefix = pathSegments.length > 0 ? `/${pathSegments[0]}` : ''
+  return `${prefix}/upload-status/${uploadId}`
+}
+
 /**
  * Polls the upload status endpoint until the file is ready or timeout occurs
  * @param {string} uploadId - The upload ID to check
@@ -205,7 +255,12 @@ function pollUploadStatus(uploadId) {
       return
     }
 
-    fetch(`/upload-status/${uploadId}`, {
+    const uploadStatusUrl = buildUploadStatusUrl(
+      window.location.pathname,
+      uploadId
+    )
+
+    fetch(uploadStatusUrl, {
       headers: {
         Accept: 'application/json'
       }
@@ -343,6 +398,7 @@ export function initFileUpload() {
     if (errorSummary) {
       errorSummary.innerHTML = ''
     }
+
     if (fileInput.files && fileInput.files.length > 0) {
       selectedFile = fileInput.files[0]
     }

package/src/server/constants.js

@@ -1 +1,3 @@
 export const PREVIEW_PATH_PREFIX = '/preview'
+export const ERROR_PREVIEW_PATH_PREFIX = '/error-preview'
+export const FORM_PREFIX = ''

package/src/server/index.test.ts

@@ -1,6 +1,7 @@
 import { type Server } from '@hapi/hapi'
 import { StatusCodes } from 'http-status-codes'
 
+import { FORM_PREFIX } from '~/src/server/constants.js'
 import { createServer } from '~/src/server/index.js'
 import {
   getFormDefinition,
@@ -57,13 +58,13 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/slug'
+        url: `${FORM_PREFIX}/slug`
       }
 
       const res = await server.inject(options)
 
       expect(res.statusCode).toBe(StatusCodes.MOVED_TEMPORARILY)
-      expect(res.headers.location).toBe('/slug/page-one')
+      expect(res.headers.location).toBe(`${FORM_PREFIX}/slug/page-one`)
       expect(getCacheSize()).toBe(1)
     })
 
@@ -77,13 +78,15 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/live/slug'
+        url: `${FORM_PREFIX}/preview/live/slug`
       }
 
       const res = await server.inject(options)
 
       expect(res.statusCode).toBe(StatusCodes.MOVED_TEMPORARILY)
-      expect(res.headers.location).toBe('/preview/live/slug/page-one')
+      expect(res.headers.location).toBe(
+        `${FORM_PREFIX}/preview/live/slug/page-one`
+      )
       expect(getCacheSize()).toBe(1)
     })
 
@@ -97,13 +100,15 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/draft/slug'
+        url: `${FORM_PREFIX}/preview/draft/slug`
       }
 
       const res = await server.inject(options)
 
       expect(res.statusCode).toBe(StatusCodes.MOVED_TEMPORARILY)
-      expect(res.headers.location).toBe('/preview/draft/slug/page-one')
+      expect(res.headers.location).toBe(
+        `${FORM_PREFIX}/preview/draft/slug/page-one`
+      )
       expect(getCacheSize()).toBe(1)
     })
 
@@ -117,7 +122,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/slug/page-one'
+        url: `${FORM_PREFIX}/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -136,7 +141,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/live/slug/page-one'
+        url: `${FORM_PREFIX}/preview/live/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -155,7 +160,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/draft/slug/page-one'
+        url: `${FORM_PREFIX}/preview/draft/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -174,7 +179,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/slug/page-one'
+        url: `${FORM_PREFIX}/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -195,7 +200,7 @@ describe('Model cache', () => {
       // Populate live/live cache item
       const options1 = {
         method: 'GET',
-        url: '/slug/page-one'
+        url: `${FORM_PREFIX}/slug/page-one`
       }
 
       const res1 = await server.inject(options1)
@@ -206,7 +211,7 @@ describe('Model cache', () => {
       // Populate live/preview cache item
       const options2 = {
         method: 'GET',
-        url: '/preview/live/slug/page-one'
+        url: `${FORM_PREFIX}/preview/live/slug/page-one`
       }
 
       const res2 = await server.inject(options2)
@@ -217,7 +222,7 @@ describe('Model cache', () => {
       // Populate draft/preview cache item
       const options3 = {
         method: 'GET',
-        url: '/preview/draft/slug/page-one'
+        url: `${FORM_PREFIX}/preview/draft/slug/page-one`
       }
 
       const res3 = await server.inject(options3)
@@ -269,7 +274,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/slug'
+        url: `${FORM_PREFIX}/slug`
       }
 
       const res = await server.inject(options)
@@ -283,7 +288,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/draft/slug'
+        url: `${FORM_PREFIX}/preview/draft/slug`
       }
 
       const res = await server.inject(options)
@@ -297,7 +302,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/live/slug'
+        url: `${FORM_PREFIX}/preview/live/slug`
       }
 
       const res = await server.inject(options)
@@ -315,7 +320,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/slug'
+        url: `${FORM_PREFIX}/slug`
       }
 
       const res = await server.inject(options)
@@ -333,7 +338,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/draft/slug'
+        url: `${FORM_PREFIX}/preview/draft/slug`
       }
 
       const res = await server.inject(options)
@@ -351,7 +356,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/live/slug'
+        url: `${FORM_PREFIX}/preview/live/slug`
       }
 
       const res = await server.inject(options)
@@ -365,7 +370,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/slug/page-one'
+        url: `${FORM_PREFIX}/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -379,7 +384,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/draft/slug/page-one'
+        url: `${FORM_PREFIX}/preview/draft/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -393,7 +398,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/live/slug/page-one'
+        url: `${FORM_PREFIX}/preview/live/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -411,7 +416,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/slug/page-one'
+        url: `${FORM_PREFIX}/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -429,7 +434,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/draft/slug/page-one'
+        url: `${FORM_PREFIX}/preview/draft/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -447,7 +452,7 @@ describe('Model cache', () => {
 
       const options = {
         method: 'GET',
-        url: '/preview/live/slug/page-one'
+        url: `${FORM_PREFIX}/preview/live/slug/page-one`
       }
 
       const res = await server.inject(options)
@@ -494,7 +499,7 @@ describe('Upload status route', () => {
 
     const options = {
       method: 'GET',
-      url: '/upload-status/123e4567-e89b-12d3-a456-426614174000'
+      url: `${FORM_PREFIX}/upload-status/123e4567-e89b-12d3-a456-426614174000`
     }
 
     const res = await server.inject(options)
@@ -511,7 +516,7 @@ describe('Upload status route', () => {
 
     const options = {
       method: 'GET',
-      url: '/upload-status/123e4567-e89b-12d3-a456-426614174000'
+      url: `${FORM_PREFIX}/upload-status/123e4567-e89b-12d3-a456-426614174000`
     }
 
     const res = await server.inject(options)
@@ -527,7 +532,7 @@ describe('Upload status route', () => {
 
     const options = {
       method: 'GET',
-      url: '/upload-status/123e4567-e89b-12d3-a456-426614174000'
+      url: `${FORM_PREFIX}/upload-status/123e4567-e89b-12d3-a456-426614174000`
     }
 
     const res = await server.inject(options)
@@ -539,7 +544,7 @@ describe('Upload status route', () => {
   test('GET /upload-status/{uploadId} returns 400 for invalid uploadId format', async () => {
     const options = {
       method: 'GET',
-      url: '/upload-status/not-a-valid-guid'
+      url: `${FORM_PREFIX}/upload-status/not-a-valid-guid`
     }
 
     const res = await server.inject(options)

package/src/server/index.ts

@@ -90,6 +90,8 @@ export async function createServer(routeConfig?: RouteConfig) {
   await server.register(Scooter)
   await server.register(pluginCrumb)
 
+  await server.register(pluginEngine)
+
   server.ext('onPreResponse', (request: Request, h: ResponseToolkit) => {
     const { response } = request
 
@@ -113,7 +115,6 @@ export async function createServer(routeConfig?: RouteConfig) {
   })
 
   await server.register(pluginViews)
-  await server.register(pluginEngine)
 
   await server.register({
     plugin: {