@defra/forms-engine-plugin 0.1.27 → 0.1.29

package/.server/server/plugins/engine/views/components/tag-env/template.test.js

@@ -1,59 +1,25 @@
 import { renderMacro } from "../../../../../../../test/helpers/component-helpers.js";
 describe('Tag environment component', () => {
-  describe.each([{
-    text: 'Local',
-    env: 'local',
-    colour: 'green'
-  }, {
-    text: 'Development',
-    env: 'dev',
-    colour: 'grey'
-  }, {
-    text: 'Test',
-    env: 'test',
-    colour: 'yellow'
-  }, {
-    text: 'External test',
-    env: 'ext-test',
-    colour: 'yellow'
-  }, {
-    text: 'Performance test',
-    env: 'perf-test',
-    colour: 'yellow'
-  }, {
-    text: 'Production',
-    env: 'prod',
-    colour: 'red'
-  }, {
-    text: 'Unknown environment',
-    env: 'unknown-environment',
-    colour: 'grey'
-  }])('Environment: $text', ({
-    text,
-    env,
-    colour
-  }) => {
-    let $component = /** @type {HTMLElement | null} */null;
-    beforeEach(() => {
-      const {
-        container
-      } = renderMacro('appTagEnv', 'components/tag-env/macro.njk', {
-        params: {
-          env
-        }
-      });
-      $component = container.getByRole('strong');
-    });
-    it('should render contents', () => {
-      expect($component).toBeInTheDocument();
-      expect($component).toHaveClass('govuk-tag');
-    });
-    it('should have text content', () => {
-      expect($component).toHaveTextContent(text);
-    });
-    it('should use environment colour', () => {
-      expect($component).toHaveClass(`govuk-tag--${colour}`);
+  let $component = /** @type {HTMLElement | null} */null;
+  beforeEach(() => {
+    const {
+      container
+    } = renderMacro('appTagEnv', 'components/tag-env/macro.njk', {
+      params: {
+        env: 'Devtool'
+      }
     });
+    $component = container.getByRole('strong');
+  });
+  it('should render contents', () => {
+    expect($component).toBeInTheDocument();
+    expect($component).toHaveClass('govuk-tag');
+  });
+  it('should have text content', () => {
+    expect($component).toHaveTextContent('Devtool');
+  });
+  it('should use environment colour', () => {
+    expect($component).toHaveClass(`govuk-tag--grey`);
   });
 });
 //# sourceMappingURL=template.test.js.map

package/.server/server/plugins/engine/views/components/tag-env/template.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.test.js","names":["renderMacro","describe","each","text","env","colour","$component","beforeEach","container","params","getByRole","it","expect","toBeInTheDocument","toHaveClass","toHaveTextContent"],"sources":["../../../../../../../src/server/plugins/engine/views/components/tag-env/template.test.js"],"sourcesContent":["import { renderMacro } from '~/test/helpers/component-helpers.js'\n\ndescribe('Tag environment component', () => {\n  describe.each([\n    {\n      text: 'Local',\n      env: 'local',\n      colour: 'green'\n    },\n    {\n      text: 'Development',\n      env: 'dev',\n      colour: 'grey'\n    },\n    {\n      text: 'Test',\n      env: 'test',\n      colour: 'yellow'\n    },\n    {\n      text: 'External test',\n      env: 'ext-test',\n      colour: 'yellow'\n    },\n    {\n      text: 'Performance test',\n      env: 'perf-test',\n      colour: 'yellow'\n    },\n    {\n      text: 'Production',\n      env: 'prod',\n      colour: 'red'\n    },\n    {\n      text: 'Unknown environment',\n      env: 'unknown-environment',\n      colour: 'grey'\n    }\n  ])('Environment: $text', ({ text, env, colour }) => {\n    let $component = /** @type {HTMLElement | null} */ (null)\n\n    beforeEach(() => {\n      const { container } = renderMacro(\n        'appTagEnv',\n        'components/tag-env/macro.njk',\n        { params: { env } }\n      )\n\n      $component = container.getByRole('strong')\n    })\n\n    it('should render contents', () => {\n      expect($component).toBeInTheDocument()\n      expect($component).toHaveClass('govuk-tag')\n    })\n\n    it('should have text content', () => {\n      expect($component).toHaveTextContent(text)\n    })\n\n    it('should use environment colour', () => {\n      expect($component).toHaveClass(`govuk-tag--${colour}`)\n    })\n  })\n})\n"],"mappings":"AAAA,SAASA,WAAW;AAEpBC,QAAQ,CAAC,2BAA2B,EAAE,MAAM;EAC1CA,QAAQ,CAACC,IAAI,CAAC,CACZ;IACEC,IAAI,EAAE,OAAO;IACbC,GAAG,EAAE,OAAO;IACZC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,aAAa;IACnBC,GAAG,EAAE,KAAK;IACVC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,MAAM;IACZC,GAAG,EAAE,MAAM;IACXC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,eAAe;IACrBC,GAAG,EAAE,UAAU;IACfC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,kBAAkB;IACxBC,GAAG,EAAE,WAAW;IAChBC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,YAAY;IAClBC,GAAG,EAAE,MAAM;IACXC,MAAM,EAAE;EACV,CAAC,EACD;IACEF,IAAI,EAAE,qBAAqB;IAC3BC,GAAG,EAAE,qBAAqB;IAC1BC,MAAM,EAAE;EACV,CAAC,CACF,CAAC,CAAC,oBAAoB,EAAE,CAAC;IAAEF,IAAI;IAAEC,GAAG;IAAEC;EAAO,CAAC,KAAK;IAClD,IAAIC,UAAU,GAAG,iCAAmC,IAAK;IAEzDC,UAAU,CAAC,MAAM;MACf,MAAM;QAAEC;MAAU,CAAC,GAAGR,WAAW,CAC/B,WAAW,EACX,8BAA8B,EAC9B;QAAES,MAAM,EAAE;UAAEL;QAAI;MAAE,CACpB,CAAC;MAEDE,UAAU,GAAGE,SAAS,CAACE,SAAS,CAAC,QAAQ,CAAC;IAC5C,CAAC,CAAC;IAEFC,EAAE,CAAC,wBAAwB,EAAE,MAAM;MACjCC,MAAM,CAACN,UAAU,CAAC,CAACO,iBAAiB,CAAC,CAAC;MACtCD,MAAM,CAACN,UAAU,CAAC,CAACQ,WAAW,CAAC,WAAW,CAAC;IAC7C,CAAC,CAAC;IAEFH,EAAE,CAAC,0BAA0B,EAAE,MAAM;MACnCC,MAAM,CAACN,UAAU,CAAC,CAACS,iBAAiB,CAACZ,IAAI,CAAC;IAC5C,CAAC,CAAC;IAEFQ,EAAE,CAAC,+BAA+B,EAAE,MAAM;MACxCC,MAAM,CAACN,UAAU,CAAC,CAACQ,WAAW,CAAC,cAAcT,MAAM,EAAE,CAAC;IACxD,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"template.test.js","names":["renderMacro","describe","$component","beforeEach","container","params","env","getByRole","it","expect","toBeInTheDocument","toHaveClass","toHaveTextContent"],"sources":["../../../../../../../src/server/plugins/engine/views/components/tag-env/template.test.js"],"sourcesContent":["import { renderMacro } from '~/test/helpers/component-helpers.js'\n\ndescribe('Tag environment component', () => {\n  let $component = /** @type {HTMLElement | null} */ (null)\n\n  beforeEach(() => {\n    const { container } = renderMacro(\n      'appTagEnv',\n      'components/tag-env/macro.njk',\n      { params: { env: 'Devtool' } }\n    )\n\n    $component = container.getByRole('strong')\n  })\n\n  it('should render contents', () => {\n    expect($component).toBeInTheDocument()\n    expect($component).toHaveClass('govuk-tag')\n  })\n\n  it('should have text content', () => {\n    expect($component).toHaveTextContent('Devtool')\n  })\n\n  it('should use environment colour', () => {\n    expect($component).toHaveClass(`govuk-tag--grey`)\n  })\n})\n"],"mappings":"AAAA,SAASA,WAAW;AAEpBC,QAAQ,CAAC,2BAA2B,EAAE,MAAM;EAC1C,IAAIC,UAAU,GAAG,iCAAmC,IAAK;EAEzDC,UAAU,CAAC,MAAM;IACf,MAAM;MAAEC;IAAU,CAAC,GAAGJ,WAAW,CAC/B,WAAW,EACX,8BAA8B,EAC9B;MAAEK,MAAM,EAAE;QAAEC,GAAG,EAAE;MAAU;IAAE,CAC/B,CAAC;IAEDJ,UAAU,GAAGE,SAAS,CAACG,SAAS,CAAC,QAAQ,CAAC;EAC5C,CAAC,CAAC;EAEFC,EAAE,CAAC,wBAAwB,EAAE,MAAM;IACjCC,MAAM,CAACP,UAAU,CAAC,CAACQ,iBAAiB,CAAC,CAAC;IACtCD,MAAM,CAACP,UAAU,CAAC,CAACS,WAAW,CAAC,WAAW,CAAC;EAC7C,CAAC,CAAC;EAEFH,EAAE,CAAC,0BAA0B,EAAE,MAAM;IACnCC,MAAM,CAACP,UAAU,CAAC,CAACU,iBAAiB,CAAC,SAAS,CAAC;EACjD,CAAC,CAAC;EAEFJ,EAAE,CAAC,+BAA+B,EAAE,MAAM;IACxCC,MAAM,CAACP,UAAU,CAAC,CAACS,WAAW,CAAC,iBAAiB,CAAC;EACnD,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}

package/.server/server/plugins/nunjucks/environment.d.ts

@@ -13,6 +13,7 @@ export function checkComponentTemplates(this: NunjucksContext, component: Compon
  * @param {string} template
  */
 export function evaluate(this: NunjucksContext, template: string): string;
+export function govukRebrand(): boolean;
 export const paths: string[];
 export const environment: nunjucks.Environment;
 import type { FormSubmissionError } from '~/src/server/plugins/engine/types.js';

package/.server/server/plugins/nunjucks/environment.js

@@ -86,7 +86,10 @@ export function evaluate(template) {
   return context ? evaluateTemplate(template, context) : template;
 }
 environment.addGlobal('evaluate', evaluate);
-environment.addGlobal('govukRebrand', config.get('showRebrand'));
+export function govukRebrand() {
+  return true;
+}
+environment.addGlobal('govukRebrand', govukRebrand());
 
 /**
  * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'

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

@@ -1 +1 @@
-{"version":3,"file":"environment.js","names":["dirname","join","ComponentType","nunjucks","resolvePkg","config","evaluateTemplate","filters","govukFrontendPath","sync","paths","get","environment","configure","trimBlocks","lstripBlocks","watch","noCache","name","nunjucksFilter","Object","entries","addFilter","checkErrorTemplates","errors","context","ctx","forEach","error","text","addGlobal","checkComponentTemplates","component","isFormComponent","model","fieldset","legend","label","errorMessage","message","type","Html","content","evaluate","template"],"sources":["../../../../src/server/plugins/nunjucks/environment.js"],"sourcesContent":["import { dirname, join } from 'node:path'\n\nimport { ComponentType } from '@defra/forms-model'\nimport nunjucks from 'nunjucks'\nimport resolvePkg from 'resolve'\n\nimport { config } from '~/src/config/index.js'\nimport { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nconst govukFrontendPath = dirname(\n  resolvePkg.sync('govuk-frontend/package.json')\n)\n\nexport const paths = [\n  join(config.get('appDir'), 'plugins/engine/views'),\n  join(config.get('appDir'), 'views')\n]\n\nexport const environment = nunjucks.configure(\n  [...paths, join(govukFrontendPath, 'dist')],\n  {\n    trimBlocks: true,\n    lstripBlocks: true,\n    watch: config.get('isDevelopment'),\n    noCache: config.get('isDevelopment')\n  }\n)\n\nfor (const [name, nunjucksFilter] of Object.entries(filters)) {\n  environment.addFilter(name, nunjucksFilter)\n}\n\n/**\n * @this {NunjucksContext}\n * @param {FormSubmissionError[]} errors\n */\nexport function checkErrorTemplates(errors) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return errors\n  }\n\n  errors.forEach((error) => {\n    error.text = evaluateTemplate(error.text, context)\n  })\n\n  return errors\n}\n\nenvironment.addGlobal('checkErrorTemplates', checkErrorTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {ComponentViewModel} component\n */\nexport function checkComponentTemplates(component) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return component\n  }\n\n  if (component.isFormComponent) {\n    // Evaluate label/legend text\n    if (component.model.fieldset?.legend?.text) {\n      const legend = component.model.fieldset.legend\n\n      legend.text = evaluateTemplate(legend.text, context)\n    } else if (component.model.label?.text) {\n      const label = component.model.label\n\n      label.text = evaluateTemplate(label.text, context)\n    } else {\n      // No template evaluation needed for other component types\n    }\n\n    // Evaluate error message\n    if (component.model.errorMessage?.text) {\n      const message = component.model.errorMessage\n\n      message.text = evaluateTemplate(message.text, context)\n    }\n  } else if (component.type === ComponentType.Html) {\n    const content = component.model.content\n\n    if (typeof content === 'string') {\n      component.model.content = evaluateTemplate(content, context)\n    }\n  } else {\n    // No template evaluation needed for other component types\n  }\n\n  return component\n}\n\nenvironment.addGlobal('checkComponentTemplates', checkComponentTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {string} template\n */\nexport function evaluate(template) {\n  const { context } = this.ctx\n\n  return context ? evaluateTemplate(template, context) : template\n}\n\nenvironment.addGlobal('evaluate', evaluate)\nenvironment.addGlobal('govukRebrand', config.get('showRebrand'))\n\n/**\n * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormSubmissionError } from '~/src/server/plugins/engine/types.js'\n * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'\n */\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"environment.js","names":["dirname","join","ComponentType","nunjucks","resolvePkg","config","evaluateTemplate","filters","govukFrontendPath","sync","paths","get","environment","configure","trimBlocks","lstripBlocks","watch","noCache","name","nunjucksFilter","Object","entries","addFilter","checkErrorTemplates","errors","context","ctx","forEach","error","text","addGlobal","checkComponentTemplates","component","isFormComponent","model","fieldset","legend","label","errorMessage","message","type","Html","content","evaluate","template","govukRebrand"],"sources":["../../../../src/server/plugins/nunjucks/environment.js"],"sourcesContent":["import { dirname, join } from 'node:path'\n\nimport { ComponentType } from '@defra/forms-model'\nimport nunjucks from 'nunjucks'\nimport resolvePkg from 'resolve'\n\nimport { config } from '~/src/config/index.js'\nimport { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nconst govukFrontendPath = dirname(\n  resolvePkg.sync('govuk-frontend/package.json')\n)\n\nexport const paths = [\n  join(config.get('appDir'), 'plugins/engine/views'),\n  join(config.get('appDir'), 'views')\n]\n\nexport const environment = nunjucks.configure(\n  [...paths, join(govukFrontendPath, 'dist')],\n  {\n    trimBlocks: true,\n    lstripBlocks: true,\n    watch: config.get('isDevelopment'),\n    noCache: config.get('isDevelopment')\n  }\n)\n\nfor (const [name, nunjucksFilter] of Object.entries(filters)) {\n  environment.addFilter(name, nunjucksFilter)\n}\n\n/**\n * @this {NunjucksContext}\n * @param {FormSubmissionError[]} errors\n */\nexport function checkErrorTemplates(errors) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return errors\n  }\n\n  errors.forEach((error) => {\n    error.text = evaluateTemplate(error.text, context)\n  })\n\n  return errors\n}\n\nenvironment.addGlobal('checkErrorTemplates', checkErrorTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {ComponentViewModel} component\n */\nexport function checkComponentTemplates(component) {\n  const { context } = this.ctx\n\n  if (!context) {\n    return component\n  }\n\n  if (component.isFormComponent) {\n    // Evaluate label/legend text\n    if (component.model.fieldset?.legend?.text) {\n      const legend = component.model.fieldset.legend\n\n      legend.text = evaluateTemplate(legend.text, context)\n    } else if (component.model.label?.text) {\n      const label = component.model.label\n\n      label.text = evaluateTemplate(label.text, context)\n    } else {\n      // No template evaluation needed for other component types\n    }\n\n    // Evaluate error message\n    if (component.model.errorMessage?.text) {\n      const message = component.model.errorMessage\n\n      message.text = evaluateTemplate(message.text, context)\n    }\n  } else if (component.type === ComponentType.Html) {\n    const content = component.model.content\n\n    if (typeof content === 'string') {\n      component.model.content = evaluateTemplate(content, context)\n    }\n  } else {\n    // No template evaluation needed for other component types\n  }\n\n  return component\n}\n\nenvironment.addGlobal('checkComponentTemplates', checkComponentTemplates)\n\n/**\n * @this {NunjucksContext}\n * @param {string} template\n */\nexport function evaluate(template) {\n  const { context } = this.ctx\n\n  return context ? evaluateTemplate(template, context) : template\n}\n\nenvironment.addGlobal('evaluate', evaluate)\n\nexport function govukRebrand() {\n  return true\n}\n\nenvironment.addGlobal('govukRebrand', govukRebrand())\n\n/**\n * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'\n * @import { FormSubmissionError } from '~/src/server/plugins/engine/types.js'\n * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'\n */\n"],"mappings":"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","ignoreList":[]}

package/.server/server/services/cacheService.js

@@ -23,7 +23,7 @@ export class CacheService {
   }
   async getState(request) {
     const cached = await this.cache.get(this.Key(request));
-    return cached || {};
+    return cached ?? {};
   }
   async setState(request, state) {
     const key = this.Key(request);
@@ -34,7 +34,7 @@ export class CacheService {
   async getConfirmationState(request) {
     const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation);
     const value = await this.cache.get(key);
-    return value || {};
+    return value ?? {};
   }
   async setConfirmationState(request, confirmationState) {
     const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation);

package/.server/server/services/cacheService.js.map

@@ -1 +1 @@
-{"version":3,"file":"cacheService.js","names":["Hoek","config","partition","ADDITIONAL_IDENTIFIER","CacheService","cache","logger","constructor","server","cacheName","log","segment","getState","request","cached","get","Key","setState","state","key","ttl","set","getConfirmationState","Confirmation","value","setConfirmationState","confirmationState","clearState","yar","id","drop","getFlash","messages","flash","Array","isArray","length","at","setFlash","message","additionalIdentifier","Error","params","slug","merge","update","mergeArrays"],"sources":["../../../src/server/services/cacheService.ts"],"sourcesContent":["import { type Request, type Server } from '@hapi/hapi'\nimport * as Hoek from '@hapi/hoek'\n\nimport { config } from '~/src/config/index.js'\nimport { type createServer } from '~/src/server/index.js'\nimport {\n  type FormPayload,\n  type FormState,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport {\n  type FormRequest,\n  type FormRequestPayload\n} from '~/src/server/routes/types.js'\n\nconst partition = 'cache'\n\nenum ADDITIONAL_IDENTIFIER {\n  Confirmation = ':confirmation'\n}\n\nexport class CacheService {\n  /**\n   * This service is responsible for getting, storing or deleting a user's session data in the cache. This service has been registered by {@link createServer}\n   */\n  cache\n  logger: Server['logger']\n\n  constructor(server: Server, cacheName?: string) {\n    if (!cacheName) {\n      server.log(\n        'warn',\n        'You are using the default hapi cache. Please provide a cache name in plugin registration options.'\n      )\n    }\n\n    this.cache = server.cache({ cache: cacheName, segment: 'formSubmission' })\n    this.logger = server.logger\n  }\n\n  async getState(\n    request: Request | FormRequest | FormRequestPayload\n  ): Promise<FormSubmissionState> {\n    const cached = await this.cache.get(this.Key(request))\n\n    return cached || {}\n  }\n\n  async setState(\n    request: FormRequest | FormRequestPayload,\n    state: FormSubmissionState\n  ) {\n    const key = this.Key(request)\n    const ttl = config.get('sessionTimeout')\n\n    await this.cache.set(key, state, ttl)\n    return this.getState(request)\n  }\n\n  async getConfirmationState(\n    request: FormRequest | FormRequestPayload\n  ): Promise<{ confirmed?: true }> {\n    const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)\n    const value = await this.cache.get(key)\n\n    return value || {}\n  }\n\n  async setConfirmationState(\n    request: FormRequest | FormRequestPayload,\n    confirmationState: { confirmed?: true }\n  ) {\n    const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)\n    const ttl = config.get('confirmationSessionTimeout')\n\n    return this.cache.set(key, confirmationState, ttl)\n  }\n\n  async clearState(request: FormRequest | FormRequestPayload) {\n    if (request.yar.id) {\n      await this.cache.drop(this.Key(request))\n    }\n  }\n\n  getFlash(\n    request: FormRequest | FormRequestPayload\n  ): { errors: FormSubmissionError[] } | undefined {\n    const key = this.Key(request)\n    const messages = request.yar.flash(key.id)\n\n    if (Array.isArray(messages) && messages.length) {\n      return messages.at(0) as { errors: FormSubmissionError[] }\n    }\n  }\n\n  setFlash(\n    request: FormRequest | FormRequestPayload,\n    message: { errors: FormSubmissionError[] }\n  ) {\n    const key = this.Key(request)\n\n    request.yar.flash(key.id, message)\n  }\n\n  /**\n   * The key used to store user session data against.\n   * If there are multiple forms on the same runner instance, for example `form-a` and `form-a-feedback` this will prevent CacheService from clearing data from `form-a` if a user gave feedback before they finished `form-a`\n   * @param request - hapi request object\n   * @param additionalIdentifier - appended to the id\n   */\n  Key(\n    request: Request | FormRequest | FormRequestPayload,\n    additionalIdentifier?: ADDITIONAL_IDENTIFIER\n  ) {\n    if (!request.yar.id) {\n      throw Error('No session ID found')\n    }\n    return {\n      segment: partition,\n      id: `${request.yar.id}:${request.params.state ?? ''}:${request.params.slug ?? ''}:${additionalIdentifier ?? ''}`\n    }\n  }\n}\n\n/**\n * State merge helper\n * 1. Merges objects (form fields)\n * 2. Overwrites arrays\n */\nexport function merge<StateType extends FormState | FormPayload>(\n  state: StateType,\n  update: object\n): StateType {\n  return Hoek.merge(state, update, {\n    mergeArrays: false\n  })\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"cacheService.js","names":["Hoek","config","partition","ADDITIONAL_IDENTIFIER","CacheService","cache","logger","constructor","server","cacheName","log","segment","getState","request","cached","get","Key","setState","state","key","ttl","set","getConfirmationState","Confirmation","value","setConfirmationState","confirmationState","clearState","yar","id","drop","getFlash","messages","flash","Array","isArray","length","at","setFlash","message","additionalIdentifier","Error","params","slug","merge","update","mergeArrays"],"sources":["../../../src/server/services/cacheService.ts"],"sourcesContent":["import { type Request, type Server } from '@hapi/hapi'\nimport * as Hoek from '@hapi/hoek'\n\nimport { config } from '~/src/config/index.js'\nimport { type createServer } from '~/src/server/index.js'\nimport {\n  type FormPayload,\n  type FormState,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport {\n  type FormRequest,\n  type FormRequestPayload\n} from '~/src/server/routes/types.js'\n\nconst partition = 'cache'\n\nenum ADDITIONAL_IDENTIFIER {\n  Confirmation = ':confirmation'\n}\n\nexport class CacheService {\n  /**\n   * This service is responsible for getting, storing or deleting a user's session data in the cache. This service has been registered by {@link createServer}\n   */\n  cache\n  logger: Server['logger']\n\n  constructor(server: Server, cacheName?: string) {\n    if (!cacheName) {\n      server.log(\n        'warn',\n        'You are using the default hapi cache. Please provide a cache name in plugin registration options.'\n      )\n    }\n\n    this.cache = server.cache({ cache: cacheName, segment: 'formSubmission' })\n    this.logger = server.logger\n  }\n\n  async getState(\n    request: Request | FormRequest | FormRequestPayload\n  ): Promise<FormSubmissionState> {\n    const cached = await this.cache.get(this.Key(request))\n\n    return cached ?? {}\n  }\n\n  async setState(\n    request: FormRequest | FormRequestPayload,\n    state: FormSubmissionState\n  ) {\n    const key = this.Key(request)\n    const ttl = config.get('sessionTimeout')\n\n    await this.cache.set(key, state, ttl)\n    return this.getState(request)\n  }\n\n  async getConfirmationState(\n    request: FormRequest | FormRequestPayload\n  ): Promise<{ confirmed?: true }> {\n    const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)\n    const value = await this.cache.get(key)\n\n    return value ?? {}\n  }\n\n  async setConfirmationState(\n    request: FormRequest | FormRequestPayload,\n    confirmationState: { confirmed?: true }\n  ) {\n    const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)\n    const ttl = config.get('confirmationSessionTimeout')\n\n    return this.cache.set(key, confirmationState, ttl)\n  }\n\n  async clearState(request: FormRequest | FormRequestPayload) {\n    if (request.yar.id) {\n      await this.cache.drop(this.Key(request))\n    }\n  }\n\n  getFlash(\n    request: FormRequest | FormRequestPayload\n  ): { errors: FormSubmissionError[] } | undefined {\n    const key = this.Key(request)\n    const messages = request.yar.flash(key.id)\n\n    if (Array.isArray(messages) && messages.length) {\n      return messages.at(0) as { errors: FormSubmissionError[] }\n    }\n  }\n\n  setFlash(\n    request: FormRequest | FormRequestPayload,\n    message: { errors: FormSubmissionError[] }\n  ) {\n    const key = this.Key(request)\n\n    request.yar.flash(key.id, message)\n  }\n\n  /**\n   * The key used to store user session data against.\n   * If there are multiple forms on the same runner instance, for example `form-a` and `form-a-feedback` this will prevent CacheService from clearing data from `form-a` if a user gave feedback before they finished `form-a`\n   * @param request - hapi request object\n   * @param additionalIdentifier - appended to the id\n   */\n  Key(\n    request: Request | FormRequest | FormRequestPayload,\n    additionalIdentifier?: ADDITIONAL_IDENTIFIER\n  ) {\n    if (!request.yar.id) {\n      throw Error('No session ID found')\n    }\n    return {\n      segment: partition,\n      id: `${request.yar.id}:${request.params.state ?? ''}:${request.params.slug ?? ''}:${additionalIdentifier ?? ''}`\n    }\n  }\n}\n\n/**\n * State merge helper\n * 1. Merges objects (form fields)\n * 2. Overwrites arrays\n */\nexport function merge<StateType extends FormState | FormPayload>(\n  state: StateType,\n  update: object\n): StateType {\n  return Hoek.merge(state, update, {\n    mergeArrays: false\n  })\n}\n"],"mappings":"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","ignoreList":[]}

package/.server/server/services/httpService.d.ts

@@ -1,7 +1,7 @@
 import Wreck from '@hapi/wreck';
 export type Method = keyof Pick<typeof Wreck, 'get' | 'post' | 'put' | 'delete'>;
 export type RequestOptions = Parameters<typeof Wreck.defaults>[0];
-export declare const request: <BodyType = Buffer<ArrayBufferLike>>(method: Method, url: string, options?: RequestOptions) => Promise<{
+export declare const request: <BodyType = Buffer>(method: Method, url: string, options?: RequestOptions) => Promise<{
     res: import("http").IncomingMessage;
     error: Error | NonNullable<BodyType>;
     payload?: undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -87,7 +87,7 @@
     "btoa": "^1.2.1",
     "convict": "^6.2.4",
     "date-fns": "^4.1.0",
-    "dotenv": "^16.5.0",
+    "dotenv": "^17.0.1",
     "expr-eval": "^2.0.2",
     "govuk-frontend": "^5.10.2",
     "hapi-pino": "^12.1.0",
@@ -109,11 +109,11 @@
     "yaml": "^2.7.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.0",
-    "@babel/plugin-syntax-import-attributes": "^7.26.0",
-    "@babel/preset-env": "^7.26.0",
-    "@babel/preset-typescript": "^7.26.0",
+    "@babel/cli": "^7.28.0",
+    "@babel/core": "^7.28.0",
+    "@babel/plugin-syntax-import-attributes": "^7.27.1",
+    "@babel/preset-env": "^7.28.0",
+    "@babel/preset-typescript": "^7.27.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@types/atob": "^2.1.4",
@@ -137,19 +137,19 @@
     "@types/url-parse": "^1.4.11",
     "@types/webpack-assets-manifest": "^5.1.4",
     "@types/wreck": "^14.0.4",
-    "@typescript-eslint/eslint-plugin": "^8.19.0",
-    "@typescript-eslint/parser": "^8.19.0",
-    "autoprefixer": "^10.4.20",
-    "babel-loader": "^9.2.1",
+    "@typescript-eslint/eslint-plugin": "^8.35.1",
+    "@typescript-eslint/parser": "^8.35.1",
+    "autoprefixer": "^10.4.21",
+    "babel-loader": "^10.0.0",
     "babel-plugin-module-resolver": "^5.0.2",
-    "babel-plugin-replace-import-extension": "^1.1.4",
-    "babel-plugin-transform-import-meta": "^2.3.2",
+    "babel-plugin-replace-import-extension": "^1.1.5",
+    "babel-plugin-transform-import-meta": "^2.3.3",
     "clean-webpack-plugin": "^4.0.0",
     "concurrently": "^9.2.0",
     "cookie": "^1.0.2",
-    "copy-webpack-plugin": "^12.0.2",
-    "core-js": "^3.39.0",
-    "cssnano": "^7.0.6",
+    "copy-webpack-plugin": "^13.0.0",
+    "core-js": "^3.43.0",
+    "cssnano": "^7.0.7",
     "cssnano-preset-default": "^7.0.4",
     "editorconfig-checker": "^6.0.0",
     "eslint": "^8.57.1",
@@ -163,25 +163,25 @@
     "eslint-plugin-promise": "^6.6.0",
     "global-jsdom": "^26.0.0",
     "husky": "^9.1.7",
-    "jest": "^30.0.2",
+    "jest": "^30.0.4",
     "jest-extended": "^4.0.2",
     "jsdom": "^26.1.0",
     "lint-staged": "^15.3.0",
-    "postcss": "^8.4.49",
+    "postcss": "^8.5.6",
     "postcss-load-config": "^6.0.1",
     "postcss-loader": "^8.1.1",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.4.2",
-    "sass-embedded": "^1.83.1",
-    "sass-loader": "^16.0.4",
+    "sass-embedded": "^1.89.2",
+    "sass-loader": "^16.0.5",
     "source-map-loader": "^5.0.0",
     "stylelint": "^16.12.0",
     "stylelint-config-gds": "^2.0.0",
-    "terser-webpack-plugin": "^5.3.11",
+    "terser-webpack-plugin": "^5.3.14",
     "tsx": "^4.20.3",
-    "typescript": "^5.7.2",
-    "webpack": "^5.97.1",
-    "webpack-assets-manifest": "^6.0.2",
+    "typescript": "^5.8.3",
+    "webpack": "^5.99.9",
+    "webpack-assets-manifest": "^6.2.1",
     "webpack-cli": "^6.0.1"
   }
 }

package/src/client/stylesheets/_tag-env.scss

@@ -21,13 +21,4 @@
       margin: 0 0 0 govuk-spacing(2);
     }
   }
-
-  &-rebrand {
-    vertical-align: middle;
-
-    // Align with product name
-    @include govuk-media-query($from: tablet) {
-      margin: -3px 0 2px;
-    }
-  }
 }

package/src/config/index.ts

@@ -78,16 +78,6 @@ export const config = convict({
     default: isTest
   },
 
-  /**
-   * Feature flags
-   */
-  showRebrand: {
-    doc: 'If this app should show the 2025 rebrand',
-    format: Boolean,
-    env: 'SHOW_GOVUK_REBRAND',
-    default: false
-  },
-
   /**
    * Service
    */

package/src/server/plugins/engine/components/FormComponent.ts

@@ -159,6 +159,7 @@ export class FormComponent extends ComponentBase {
 
   getDisplayStringFromState(state: FormSubmissionState): string {
     const value = this.getFormValueFromState(state)
+    // eslint-disable-next-line @typescript-eslint/no-base-to-string
     return this.isValue(value) ? value.toString() : ''
   }
 

package/src/server/plugins/engine/components/helpers.ts

@@ -363,7 +363,5 @@ export const addClassOptionIfNone = (
   options: Extract<ComponentDef, { options: { classes?: string } }>['options'],
   className: string
 ) => {
-  if (!options.classes) {
-    options.classes = className
-  }
+  options.classes ??= className
 }

package/src/server/plugins/engine/index.ts

@@ -6,7 +6,8 @@ import { type FilterFunction } from '~/src/server/plugins/engine/types.js'
 import {
   checkComponentTemplates,
   checkErrorTemplates,
-  evaluate
+  evaluate,
+  govukRebrand
 } from '~/src/server/plugins/nunjucks/environment.js'
 import * as filters from '~/src/server/plugins/nunjucks/filters/index.js'
 
@@ -16,7 +17,8 @@ export { context } from '~/src/server/plugins/nunjucks/context.js'
 const globals = {
   checkComponentTemplates,
   checkErrorTemplates,
-  evaluate
+  evaluate,
+  govukRebrand
 }
 
 export const VIEW_PATH = 'src/server/plugins/engine/views'

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

@@ -463,9 +463,7 @@ export class FormModel {
       }
 
       if (isInvalid) {
-        if (!context.errors) {
-          context.errors = []
-        }
+        context.errors ??= []
 
         const text =
           'Options are different because you changed a previous answer'

package/src/server/plugins/engine/views/components/tag-env/template.njk

@@ -1,32 +1,9 @@
 {%- from "govuk/components/tag/macro.njk" import govukTag -%}
-{% if govukRebrand %}
-  {% set tagEnv = " app-tag--env app-tag--env-rebrand" %}
-{% else %}
-  {% set tagEnv = " app-tag--env" %}
-{% endif %}
-{%- switch params.env %}
-  {% case "local" %}
-    {% set text = "Local" %}
-    {% set classes = "govuk-tag--green" %}
-  {% case "dev" %}
-    {% set text = "Development" %}
-    {% set classes = "govuk-tag--grey" %}
-  {% case "test" %}
-    {% set text = "Test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "ext-test" %}
-    {% set text = "External test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "perf-test" %}
-    {% set text = "Performance test" %}
-    {% set classes = "govuk-tag--yellow" %}
-  {% case "prod" %}
-    {% set text = "Production" %}
-    {% set classes = "govuk-tag--red" %}
-  {% default %}
-    {% set text = params.env | replace("-", " ") | capitalize %}
-    {% set classes = "govuk-tag--grey" %}
-{% endswitch -%}
+
+{% set tagEnv = " app-tag--env" %}
+
+{% set text = params.env | replace("-", " ") | capitalize %}
+{% set classes = "govuk-tag--grey" %}
 
 {{ govukTag({
   text: text,

package/src/server/plugins/engine/views/components/tag-env/template.test.js

@@ -1,66 +1,28 @@
 import { renderMacro } from '~/test/helpers/component-helpers.js'
 
 describe('Tag environment component', () => {
-  describe.each([
-    {
-      text: 'Local',
-      env: 'local',
-      colour: 'green'
-    },
-    {
-      text: 'Development',
-      env: 'dev',
-      colour: 'grey'
-    },
-    {
-      text: 'Test',
-      env: 'test',
-      colour: 'yellow'
-    },
-    {
-      text: 'External test',
-      env: 'ext-test',
-      colour: 'yellow'
-    },
-    {
-      text: 'Performance test',
-      env: 'perf-test',
-      colour: 'yellow'
-    },
-    {
-      text: 'Production',
-      env: 'prod',
-      colour: 'red'
-    },
-    {
-      text: 'Unknown environment',
-      env: 'unknown-environment',
-      colour: 'grey'
-    }
-  ])('Environment: $text', ({ text, env, colour }) => {
-    let $component = /** @type {HTMLElement | null} */ (null)
+  let $component = /** @type {HTMLElement | null} */ (null)
 
-    beforeEach(() => {
-      const { container } = renderMacro(
-        'appTagEnv',
-        'components/tag-env/macro.njk',
-        { params: { env } }
-      )
+  beforeEach(() => {
+    const { container } = renderMacro(
+      'appTagEnv',
+      'components/tag-env/macro.njk',
+      { params: { env: 'Devtool' } }
+    )
 
-      $component = container.getByRole('strong')
-    })
+    $component = container.getByRole('strong')
+  })
 
-    it('should render contents', () => {
-      expect($component).toBeInTheDocument()
-      expect($component).toHaveClass('govuk-tag')
-    })
+  it('should render contents', () => {
+    expect($component).toBeInTheDocument()
+    expect($component).toHaveClass('govuk-tag')
+  })
 
-    it('should have text content', () => {
-      expect($component).toHaveTextContent(text)
-    })
+  it('should have text content', () => {
+    expect($component).toHaveTextContent('Devtool')
+  })
 
-    it('should use environment colour', () => {
-      expect($component).toHaveClass(`govuk-tag--${colour}`)
-    })
+  it('should use environment colour', () => {
+    expect($component).toHaveClass(`govuk-tag--grey`)
   })
 })

package/src/server/plugins/nunjucks/environment.js

@@ -108,7 +108,12 @@ export function evaluate(template) {
 }
 
 environment.addGlobal('evaluate', evaluate)
-environment.addGlobal('govukRebrand', config.get('showRebrand'))
+
+export function govukRebrand() {
+  return true
+}
+
+environment.addGlobal('govukRebrand', govukRebrand())
 
 /**
  * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'

package/src/server/services/cacheService.ts

@@ -44,7 +44,7 @@ export class CacheService {
   ): Promise<FormSubmissionState> {
     const cached = await this.cache.get(this.Key(request))
 
-    return cached || {}
+    return cached ?? {}
   }
 
   async setState(
@@ -64,7 +64,7 @@ export class CacheService {
     const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)
     const value = await this.cache.get(key)
 
-    return value || {}
+    return value ?? {}
   }
 
   async setConfirmationState(