@defra/forms-engine-plugin 0.1.10 → 0.1.12

package/.server/server/plugins/errorPages.js

@@ -1,5 +1,3 @@
-import { StatusCodes } from 'http-status-codes';
-
 /*
  * Add an `onPreResponse` listener to return error pages
  */
@@ -13,33 +11,13 @@ export default {
           // An error was raised during
           // processing the request
           const statusCode = response.output.statusCode;
-
-          // Check for a form model on the request
-          // and use it to set the correct service name
-          // and start page path. In the event of a error
-          // happening inside a "form" level request, the header
-          // then displays the contextual form text and href
-          const model = request.app.model;
-          const viewModel = model ? {
-            name: model.name,
-            serviceUrl: `/${model.basePath}`
-          } : undefined;
-
-          // In the event of 404
-          // return the `404` view
-          if (statusCode === StatusCodes.NOT_FOUND.valueOf()) {
-            return h.view('404', viewModel).code(statusCode);
-          }
-          request.log('error', {
+          const error = {
             statusCode,
-            data: response.data,
             message: response.message,
             stack: response.stack
-          });
-          request.logger.error(response.stack);
-
-          // The return the `500` view
-          return h.view('500', viewModel).code(statusCode);
+          };
+          request.log('error', error);
+          return h.response(error).code(statusCode);
         }
         return h.continue;
       });

package/.server/server/plugins/errorPages.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorPages.js","names":["StatusCodes","plugin","name","register","server","ext","request","h","response","isBoom","statusCode","output","model","app","viewModel","serviceUrl","basePath","undefined","NOT_FOUND","valueOf","view","code","log","data","message","stack","logger","error","continue"],"sources":["../../../src/server/plugins/errorPages.ts"],"sourcesContent":["import {\n  type Request,\n  type ResponseToolkit,\n  type ServerRegisterPluginObject\n} from '@hapi/hapi'\nimport { StatusCodes } from 'http-status-codes'\n\n/*\n * Add an `onPreResponse` listener to return error pages\n */\nexport default {\n  plugin: {\n    name: 'error-pages',\n    register(server) {\n      server.ext('onPreResponse', (request: Request, h: ResponseToolkit) => {\n        const response = request.response\n\n        if ('isBoom' in response && response.isBoom) {\n          // An error was raised during\n          // processing the request\n          const statusCode = response.output.statusCode\n\n          // Check for a form model on the request\n          // and use it to set the correct service name\n          // and start page path. In the event of a error\n          // happening inside a \"form\" level request, the header\n          // then displays the contextual form text and href\n          const model = request.app.model\n          const viewModel = model\n            ? {\n                name: model.name,\n                serviceUrl: `/${model.basePath}`\n              }\n            : undefined\n\n          // In the event of 404\n          // return the `404` view\n          if (statusCode === StatusCodes.NOT_FOUND.valueOf()) {\n            return h.view('404', viewModel).code(statusCode)\n          }\n\n          request.log('error', {\n            statusCode,\n            data: response.data,\n            message: response.message,\n            stack: response.stack\n          })\n\n          request.logger.error(response.stack)\n\n          // The return the `500` view\n          return h.view('500', viewModel).code(statusCode)\n        }\n        return h.continue\n      })\n    }\n  }\n} satisfies ServerRegisterPluginObject<void>\n"],"mappings":"AAKA,SAASA,WAAW,QAAQ,mBAAmB;;AAE/C;AACA;AACA;AACA,eAAe;EACbC,MAAM,EAAE;IACNC,IAAI,EAAE,aAAa;IACnBC,QAAQA,CAACC,MAAM,EAAE;MACfA,MAAM,CAACC,GAAG,CAAC,eAAe,EAAE,CAACC,OAAgB,EAAEC,CAAkB,KAAK;QACpE,MAAMC,QAAQ,GAAGF,OAAO,CAACE,QAAQ;QAEjC,IAAI,QAAQ,IAAIA,QAAQ,IAAIA,QAAQ,CAACC,MAAM,EAAE;UAC3C;UACA;UACA,MAAMC,UAAU,GAAGF,QAAQ,CAACG,MAAM,CAACD,UAAU;;UAE7C;UACA;UACA;UACA;UACA;UACA,MAAME,KAAK,GAAGN,OAAO,CAACO,GAAG,CAACD,KAAK;UAC/B,MAAME,SAAS,GAAGF,KAAK,GACnB;YACEV,IAAI,EAAEU,KAAK,CAACV,IAAI;YAChBa,UAAU,EAAE,IAAIH,KAAK,CAACI,QAAQ;UAChC,CAAC,GACDC,SAAS;;UAEb;UACA;UACA,IAAIP,UAAU,KAAKV,WAAW,CAACkB,SAAS,CAACC,OAAO,CAAC,CAAC,EAAE;YAClD,OAAOZ,CAAC,CAACa,IAAI,CAAC,KAAK,EAAEN,SAAS,CAAC,CAACO,IAAI,CAACX,UAAU,CAAC;UAClD;UAEAJ,OAAO,CAACgB,GAAG,CAAC,OAAO,EAAE;YACnBZ,UAAU;YACVa,IAAI,EAAEf,QAAQ,CAACe,IAAI;YACnBC,OAAO,EAAEhB,QAAQ,CAACgB,OAAO;YACzBC,KAAK,EAAEjB,QAAQ,CAACiB;UAClB,CAAC,CAAC;UAEFnB,OAAO,CAACoB,MAAM,CAACC,KAAK,CAACnB,QAAQ,CAACiB,KAAK,CAAC;;UAEpC;UACA,OAAOlB,CAAC,CAACa,IAAI,CAAC,KAAK,EAAEN,SAAS,CAAC,CAACO,IAAI,CAACX,UAAU,CAAC;QAClD;QACA,OAAOH,CAAC,CAACqB,QAAQ;MACnB,CAAC,CAAC;IACJ;EACF;AACF,CAAC","ignoreList":[]}
+{"version":3,"file":"errorPages.js","names":["plugin","name","register","server","ext","request","h","response","isBoom","statusCode","output","error","message","stack","log","code","continue"],"sources":["../../../src/server/plugins/errorPages.ts"],"sourcesContent":["import {\n  type Request,\n  type ResponseToolkit,\n  type ServerRegisterPluginObject\n} from '@hapi/hapi'\n\n/*\n * Add an `onPreResponse` listener to return error pages\n */\nexport default {\n  plugin: {\n    name: 'error-pages',\n    register(server) {\n      server.ext('onPreResponse', (request: Request, h: ResponseToolkit) => {\n        const response = request.response\n\n        if ('isBoom' in response && response.isBoom) {\n          // An error was raised during\n          // processing the request\n          const statusCode = response.output.statusCode\n\n          const error = {\n            statusCode,\n            message: response.message,\n            stack: response.stack\n          }\n\n          request.log('error', error)\n\n          return h.response(error).code(statusCode)\n        }\n        return h.continue\n      })\n    }\n  }\n} satisfies ServerRegisterPluginObject<void>\n"],"mappings":"AAMA;AACA;AACA;AACA,eAAe;EACbA,MAAM,EAAE;IACNC,IAAI,EAAE,aAAa;IACnBC,QAAQA,CAACC,MAAM,EAAE;MACfA,MAAM,CAACC,GAAG,CAAC,eAAe,EAAE,CAACC,OAAgB,EAAEC,CAAkB,KAAK;QACpE,MAAMC,QAAQ,GAAGF,OAAO,CAACE,QAAQ;QAEjC,IAAI,QAAQ,IAAIA,QAAQ,IAAIA,QAAQ,CAACC,MAAM,EAAE;UAC3C;UACA;UACA,MAAMC,UAAU,GAAGF,QAAQ,CAACG,MAAM,CAACD,UAAU;UAE7C,MAAME,KAAK,GAAG;YACZF,UAAU;YACVG,OAAO,EAAEL,QAAQ,CAACK,OAAO;YACzBC,KAAK,EAAEN,QAAQ,CAACM;UAClB,CAAC;UAEDR,OAAO,CAACS,GAAG,CAAC,OAAO,EAAEH,KAAK,CAAC;UAE3B,OAAOL,CAAC,CAACC,QAAQ,CAACI,KAAK,CAAC,CAACI,IAAI,CAACN,UAAU,CAAC;QAC3C;QACA,OAAOH,CAAC,CAACU,QAAQ;MACnB,CAAC,CAAC;IACJ;EACF;AACF,CAAC","ignoreList":[]}

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

@@ -3,11 +3,9 @@ import { basename, join } from 'node:path';
 import Boom from '@hapi/boom';
 import { StatusCodes } from 'http-status-codes';
 import pkg from "../../../../package.json" with { type: 'json' };
-import { parseCookieConsent } from "../../../common/cookies.js";
 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} */
@@ -17,62 +15,74 @@ let webpackManifest;
  * @param {FormRequest | FormRequestPayload | null} request
  */
 export function context(request) {
-  const manifestPath = join(config.get('publicDir'), 'assets-manifest.json');
-  if (!webpackManifest) {
-    try {
-      // eslint-disable-next-line -- Allow JSON type 'any'
-      webpackManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'));
-    } catch {
-      logger.error(`Webpack ${basename(manifestPath)} not found`);
-    }
-  }
   const {
     params,
-    path,
-    query = {},
-    response,
-    state
+    response
   } = request ?? {};
-  const isForceAccess = 'force' in query;
-  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.
   const isResponseOK = !Boom.isBoom(response) && response?.statusCode === StatusCodes.OK;
+  const pluginStorage = request?.server.plugins['forms-engine-plugin'];
+  let consumerViewContext = {};
+  if (!pluginStorage) {
+    throw Error('context called before plugin registered');
+  }
+  if (!pluginStorage.baseLayoutPath) {
+    throw Error('Missing baseLayoutPath in plugin.options.nunjucks');
+  }
+  if ('viewContext' in pluginStorage) {
+    consumerViewContext = pluginStorage.viewContext(request);
+  }
 
   /** @type {ViewContext} */
   const ctx = {
+    // take consumers props first so we can override it
+    ...consumerViewContext,
+    baseLayoutPath: pluginStorage.baseLayoutPath,
     appVersion: pkg.version,
-    assetPath: '/assets',
     config: {
       cdpEnvironment: config.get('cdpEnvironment'),
       designerUrl: config.get('designerUrl'),
       feedbackLink: encodeUrl(config.get('feedbackLink')),
       phaseTag: config.get('phaseTag'),
-      serviceBannerText: config.get('serviceBannerText'),
       serviceName: config.get('serviceName'),
       serviceVersion: config.get('serviceVersion')
     },
     crumb: safeGenerateCrumb(request),
-    cspNonce: request?.plugins.blankie?.nonces?.script,
-    currentPath: request ? `${request.path}${request.url.search}` : undefined,
-    previewMode: isPreviewMode ? params?.state : undefined,
-    slug: isResponseOK ? params?.slug : undefined,
-    getAssetPath: (asset = '') => {
-      return `/${webpackManifest?.[asset] ?? asset}`;
-    }
+    currentPath: `${request.path}${request.url.search}`,
+    previewMode: isPreviewMode ? formState : undefined,
+    slug: isResponseOK ? params?.slug : undefined
   };
-  if (!isForceAccess) {
-    ctx.config.googleAnalyticsTrackingId = config.get('googleAnalyticsTrackingId');
-    if (typeof state?.cookieConsent === 'string') {
-      ctx.cookieConsent = parseCookieConsent(state.cookieConsent);
+  return ctx;
+}
+
+/**
+ * Returns the context for the devtool. Consumers won't have access to this.
+ */
+export function devtoolContext() {
+  const manifestPath = join(config.get('publicDir'), 'assets-manifest.json');
+  if (!webpackManifest) {
+    try {
+      // eslint-disable-next-line -- Allow JSON type 'any'
+      webpackManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'));
+    } catch {
+      logger.error(`Webpack ${basename(manifestPath)} not found`);
     }
   }
-  return ctx;
+  return {
+    assetPath: '/assets',
+    getDxtAssetPath: (asset = '') => {
+      return `/${webpackManifest?.[asset] ?? asset}`;
+    }
+  };
 }
 
 /**
- * @import { CookieConsent } from '~/src/common/types.js'
  * @import { ViewContext } from '~/src/server/plugins/nunjucks/types.js'
  * @import { FormRequest, FormRequestPayload } from '~/src/server/routes/types.js'
  */

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

@@ -1 +1 @@
-{"version":3,"file":"context.js","names":["readFileSync","basename","join","Boom","StatusCodes","pkg","type","parseCookieConsent","config","createLogger","PREVIEW_PATH_PREFIX","encodeUrl","safeGenerateCrumb","logger","webpackManifest","context","request","manifestPath","get","JSON","parse","error","params","path","query","response","state","isForceAccess","isPreviewMode","startsWith","isResponseOK","isBoom","statusCode","OK","ctx","appVersion","version","assetPath","cdpEnvironment","designerUrl","feedbackLink","phaseTag","serviceBannerText","serviceName","serviceVersion","crumb","cspNonce","plugins","blankie","nonces","script","currentPath","url","search","undefined","previewMode","slug","getAssetPath","asset","googleAnalyticsTrackingId","cookieConsent"],"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 { parseCookieConsent } from '~/src/common/cookies.js'\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 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  const { params, path, query = {}, response, state } = request ?? {}\n\n  const isForceAccess = 'force' in query\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  /** @type {ViewContext} */\n  const ctx = {\n    appVersion: pkg.version,\n    assetPath: '/assets',\n    config: {\n      cdpEnvironment: config.get('cdpEnvironment'),\n      designerUrl: config.get('designerUrl'),\n      feedbackLink: encodeUrl(config.get('feedbackLink')),\n      phaseTag: config.get('phaseTag'),\n      serviceBannerText: config.get('serviceBannerText'),\n      serviceName: config.get('serviceName'),\n      serviceVersion: config.get('serviceVersion')\n    },\n    crumb: safeGenerateCrumb(request),\n    cspNonce: request?.plugins.blankie?.nonces?.script,\n    currentPath: request ? `${request.path}${request.url.search}` : undefined,\n    previewMode: isPreviewMode ? params?.state : undefined,\n    slug: isResponseOK ? params?.slug : undefined,\n\n    getAssetPath: (asset = '') => {\n      return `/${webpackManifest?.[asset] ?? asset}`\n    }\n  }\n\n  if (!isForceAccess) {\n    ctx.config.googleAnalyticsTrackingId = config.get(\n      'googleAnalyticsTrackingId'\n    )\n\n    if (typeof state?.cookieConsent === 'string') {\n      ctx.cookieConsent = parseCookieConsent(state.cookieConsent)\n    }\n  }\n\n  return ctx\n}\n\n/**\n * @import { CookieConsent } from '~/src/common/types.js'\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/context.test.js

@@ -1,24 +1,22 @@
 import { tmpdir } from 'node:os';
-import { config } from "../../../config/index.js";
-import { encodeUrl } from "../engine/helpers.js";
-import { context } from "./context.js";
+import { context, devtoolContext } from "./context.js";
 describe('Nunjucks context', () => {
   beforeEach(() => jest.resetModules());
   describe('Asset path', () => {
     it("should include 'assetPath' for GOV.UK Frontend icons", () => {
       const {
         assetPath
-      } = context(null);
+      } = devtoolContext();
       expect(assetPath).toBe('/assets');
     });
   });
   describe('Asset helper', () => {
     it("should locate 'assets-manifest.json' assets", () => {
       const {
-        getAssetPath
-      } = context(null);
-      expect(getAssetPath('example.scss')).toBe('/stylesheets/example.xxxxxxx.min.css');
-      expect(getAssetPath('example.mjs')).toBe('/javascripts/example.xxxxxxx.min.js');
+        getDxtAssetPath
+      } = devtoolContext();
+      expect(getDxtAssetPath('example.scss')).toBe('/stylesheets/example.xxxxxxx.min.css');
+      expect(getDxtAssetPath('example.mjs')).toBe('/javascripts/example.xxxxxxx.min.js');
     });
     it("should return path when 'assets-manifest.json' is missing", async () => {
       await jest.isolateModulesAsync(async () => {
@@ -28,41 +26,32 @@ describe('Nunjucks context', () => {
 
         // Import when isolated to avoid cache
         const {
-          context
+          devtoolContext
         } = await import("./context.js");
 
         // Update config for missing manifest
         config.set('publicDir', tmpdir());
         const {
-          getAssetPath
-        } = context(null);
+          getDxtAssetPath
+        } = devtoolContext();
 
         // Uses original paths when missing
-        expect(getAssetPath('example.scss')).toBe('/example.scss');
-        expect(getAssetPath('example.mjs')).toBe('/example.mjs');
+        expect(getDxtAssetPath('example.scss')).toBe('/example.scss');
+        expect(getDxtAssetPath('example.mjs')).toBe('/example.mjs');
       });
     });
     it('should return path to unknown assets', () => {
       const {
-        getAssetPath
-      } = context(null);
-      expect(getAssetPath()).toBe('/');
-      expect(getAssetPath('example.jpg')).toBe('/example.jpg');
-      expect(getAssetPath('example.gif')).toBe('/example.gif');
+        getDxtAssetPath
+      } = devtoolContext();
+      expect(getDxtAssetPath()).toBe('/');
+      expect(getDxtAssetPath('example.jpg')).toBe('/example.jpg');
+      expect(getDxtAssetPath('example.gif')).toBe('/example.gif');
     });
   });
   describe('Config', () => {
     it('should include environment, phase tag and service info', () => {
-      const ctx = context(null);
-      expect(ctx.config).toEqual(expect.objectContaining({
-        cdpEnvironment: config.get('cdpEnvironment'),
-        feedbackLink: encodeUrl(config.get('feedbackLink')),
-        googleAnalyticsTrackingId: config.get('googleAnalyticsTrackingId'),
-        phaseTag: config.get('phaseTag'),
-        serviceBannerText: config.get('serviceBannerText'),
-        serviceName: config.get('serviceName'),
-        serviceVersion: config.get('serviceVersion')
-      }));
+      expect(() => context(null)).toThrow('context called before plugin registered');
     });
   });
   describe('Crumb', () => {
@@ -75,6 +64,9 @@ describe('Nunjucks context', () => {
           plugins: {
             crumb: {
               generate: jest.fn()
+            },
+            'forms-engine-plugin': {
+              baseLayoutPath: 'randomValue'
             }
           }
         },
@@ -104,6 +96,9 @@ describe('Nunjucks context', () => {
           plugins: {
             crumb: {
               generate: jest.fn().mockReturnValue(mockCrumb)
+            },
+            'forms-engine-plugin': {
+              baseLayoutPath: 'randomValue'
             }
           }
         },

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

@@ -1 +1 @@
-{"version":3,"file":"context.test.js","names":["tmpdir","config","encodeUrl","context","describe","beforeEach","jest","resetModules","it","assetPath","expect","toBe","getAssetPath","isolateModulesAsync","set","ctx","toEqual","objectContaining","cdpEnvironment","get","feedbackLink","googleAnalyticsTrackingId","phaseTag","serviceBannerText","serviceName","serviceVersion","malformedRequest","server","plugins","crumb","generate","fn","route","settings","path","url","search","toBeUndefined","not","toHaveBeenCalled","mockCrumb","validRequest","mockReturnValue","state","toHaveBeenCalledWith"],"sources":["../../../../src/server/plugins/nunjucks/context.test.js"],"sourcesContent":["import { tmpdir } from 'node:os'\n\nimport { config } from '~/src/config/index.js'\nimport { encodeUrl } from '~/src/server/plugins/engine/helpers.js'\nimport { context } from '~/src/server/plugins/nunjucks/context.js'\n\ndescribe('Nunjucks context', () => {\n  beforeEach(() => jest.resetModules())\n\n  describe('Asset path', () => {\n    it(\"should include 'assetPath' for GOV.UK Frontend icons\", () => {\n      const { assetPath } = context(null)\n      expect(assetPath).toBe('/assets')\n    })\n  })\n\n  describe('Asset helper', () => {\n    it(\"should locate 'assets-manifest.json' assets\", () => {\n      const { getAssetPath } = context(null)\n\n      expect(getAssetPath('example.scss')).toBe(\n        '/stylesheets/example.xxxxxxx.min.css'\n      )\n\n      expect(getAssetPath('example.mjs')).toBe(\n        '/javascripts/example.xxxxxxx.min.js'\n      )\n    })\n\n    it(\"should return path when 'assets-manifest.json' is missing\", async () => {\n      await jest.isolateModulesAsync(async () => {\n        const { config } = await import('~/src/config/index.js')\n\n        // Import when isolated to avoid cache\n        const { context } = await import(\n          '~/src/server/plugins/nunjucks/context.js'\n        )\n\n        // Update config for missing manifest\n        config.set('publicDir', tmpdir())\n        const { getAssetPath } = context(null)\n\n        // Uses original paths when missing\n        expect(getAssetPath('example.scss')).toBe('/example.scss')\n        expect(getAssetPath('example.mjs')).toBe('/example.mjs')\n      })\n    })\n\n    it('should return path to unknown assets', () => {\n      const { getAssetPath } = context(null)\n\n      expect(getAssetPath()).toBe('/')\n      expect(getAssetPath('example.jpg')).toBe('/example.jpg')\n      expect(getAssetPath('example.gif')).toBe('/example.gif')\n    })\n  })\n\n  describe('Config', () => {\n    it('should include environment, phase tag and service info', () => {\n      const ctx = context(null)\n\n      expect(ctx.config).toEqual(\n        expect.objectContaining({\n          cdpEnvironment: config.get('cdpEnvironment'),\n          feedbackLink: encodeUrl(config.get('feedbackLink')),\n          googleAnalyticsTrackingId: config.get('googleAnalyticsTrackingId'),\n          phaseTag: config.get('phaseTag'),\n          serviceBannerText: config.get('serviceBannerText'),\n          serviceName: config.get('serviceName'),\n          serviceVersion: config.get('serviceVersion')\n        })\n      )\n    })\n  })\n\n  describe('Crumb', () => {\n    it('should handle malformed requests with missing state', () => {\n      // While state should always exist in a valid Hapi request (it holds cookies),\n      // we've seen malformed requests in production where it's missing\n      const malformedRequest = /** @type {FormRequest} */ (\n        /** @type {unknown} */ ({\n          server: {\n            plugins: {\n              crumb: {\n                generate: jest.fn()\n              }\n            }\n          },\n          plugins: {},\n          route: {\n            settings: {\n              plugins: {}\n            }\n          },\n          path: '/test',\n          url: { search: '' }\n          // state intentionally omitted to test real malformed requests\n        })\n      )\n\n      const { crumb } = context(malformedRequest)\n      expect(crumb).toBeUndefined()\n      expect(\n        malformedRequest.server.plugins.crumb.generate\n      ).not.toHaveBeenCalled()\n    })\n\n    it('should generate crumb when state exists', () => {\n      const mockCrumb = 'generated-crumb-value'\n      const validRequest = /** @type {FormRequest} */ (\n        /** @type {unknown} */ ({\n          server: {\n            plugins: {\n              crumb: {\n                generate: jest.fn().mockReturnValue(mockCrumb)\n              }\n            }\n          },\n          plugins: {},\n          route: {\n            settings: {\n              plugins: {}\n            }\n          },\n          path: '/test',\n          url: { search: '' },\n          state: {}\n        })\n      )\n\n      const { crumb } = context(validRequest)\n      expect(crumb).toBe(mockCrumb)\n      expect(validRequest.server.plugins.crumb.generate).toHaveBeenCalledWith(\n        validRequest\n      )\n    })\n  })\n})\n\n/**\n * @import { FormRequest } from '~/src/server/routes/types.js'\n */\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"context.test.js","names":["tmpdir","context","devtoolContext","describe","beforeEach","jest","resetModules","it","assetPath","expect","toBe","getDxtAssetPath","isolateModulesAsync","config","set","toThrow","malformedRequest","server","plugins","crumb","generate","fn","baseLayoutPath","route","settings","path","url","search","toBeUndefined","not","toHaveBeenCalled","mockCrumb","validRequest","mockReturnValue","state","toHaveBeenCalledWith"],"sources":["../../../../src/server/plugins/nunjucks/context.test.js"],"sourcesContent":["import { tmpdir } from 'node:os'\n\nimport {\n  context,\n  devtoolContext\n} from '~/src/server/plugins/nunjucks/context.js'\n\ndescribe('Nunjucks context', () => {\n  beforeEach(() => jest.resetModules())\n\n  describe('Asset path', () => {\n    it(\"should include 'assetPath' for GOV.UK Frontend icons\", () => {\n      const { assetPath } = devtoolContext()\n      expect(assetPath).toBe('/assets')\n    })\n  })\n\n  describe('Asset helper', () => {\n    it(\"should locate 'assets-manifest.json' assets\", () => {\n      const { getDxtAssetPath } = devtoolContext()\n\n      expect(getDxtAssetPath('example.scss')).toBe(\n        '/stylesheets/example.xxxxxxx.min.css'\n      )\n\n      expect(getDxtAssetPath('example.mjs')).toBe(\n        '/javascripts/example.xxxxxxx.min.js'\n      )\n    })\n\n    it(\"should return path when 'assets-manifest.json' is missing\", async () => {\n      await jest.isolateModulesAsync(async () => {\n        const { config } = await import('~/src/config/index.js')\n\n        // Import when isolated to avoid cache\n        const { devtoolContext } = await import(\n          '~/src/server/plugins/nunjucks/context.js'\n        )\n\n        // Update config for missing manifest\n        config.set('publicDir', tmpdir())\n        const { getDxtAssetPath } = devtoolContext()\n\n        // Uses original paths when missing\n        expect(getDxtAssetPath('example.scss')).toBe('/example.scss')\n        expect(getDxtAssetPath('example.mjs')).toBe('/example.mjs')\n      })\n    })\n\n    it('should return path to unknown assets', () => {\n      const { getDxtAssetPath } = devtoolContext()\n\n      expect(getDxtAssetPath()).toBe('/')\n      expect(getDxtAssetPath('example.jpg')).toBe('/example.jpg')\n      expect(getDxtAssetPath('example.gif')).toBe('/example.gif')\n    })\n  })\n\n  describe('Config', () => {\n    it('should include environment, phase tag and service info', () => {\n      expect(() => context(null)).toThrow(\n        'context called before plugin registered'\n      )\n    })\n  })\n\n  describe('Crumb', () => {\n    it('should handle malformed requests with missing state', () => {\n      // While state should always exist in a valid Hapi request (it holds cookies),\n      // we've seen malformed requests in production where it's missing\n      const malformedRequest = /** @type {FormRequest} */ (\n        /** @type {unknown} */ ({\n          server: {\n            plugins: {\n              crumb: {\n                generate: jest.fn()\n              },\n              'forms-engine-plugin': {\n                baseLayoutPath: 'randomValue'\n              }\n            }\n          },\n          plugins: {},\n          route: {\n            settings: {\n              plugins: {}\n            }\n          },\n          path: '/test',\n          url: { search: '' }\n          // state intentionally omitted to test real malformed requests\n        })\n      )\n\n      const { crumb } = context(malformedRequest)\n      expect(crumb).toBeUndefined()\n      expect(\n        malformedRequest.server.plugins.crumb.generate\n      ).not.toHaveBeenCalled()\n    })\n\n    it('should generate crumb when state exists', () => {\n      const mockCrumb = 'generated-crumb-value'\n      const validRequest = /** @type {FormRequest} */ (\n        /** @type {unknown} */ ({\n          server: {\n            plugins: {\n              crumb: {\n                generate: jest.fn().mockReturnValue(mockCrumb)\n              },\n              'forms-engine-plugin': {\n                baseLayoutPath: 'randomValue'\n              }\n            }\n          },\n          plugins: {},\n          route: {\n            settings: {\n              plugins: {}\n            }\n          },\n          path: '/test',\n          url: { search: '' },\n          state: {}\n        })\n      )\n\n      const { crumb } = context(validRequest)\n      expect(crumb).toBe(mockCrumb)\n      expect(validRequest.server.plugins.crumb.generate).toHaveBeenCalledWith(\n        validRequest\n      )\n    })\n  })\n})\n\n/**\n * @import { FormRequest } 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/plugins/nunjucks/types.js

@@ -12,16 +12,15 @@
 /**
  * @typedef {object} ViewContext - Nunjucks view context
  * @property {string} appVersion - Application version
- * @property {string} assetPath - Asset path
+ * @property {string} [baseLayoutPath] - Base layout path
  * @property {Partial<Config>} config - Application config properties
- * @property {CookieConsent} [cookieConsent] - Cookie consent preferences
  * @property {string} [crumb] - Cross-Site Request Forgery (CSRF) token
  * @property {string} [cspNonce] - Content Security Policy (CSP) nonce
  * @property {string} [currentPath] - Current path
  * @property {string} [previewMode] - Preview mode
  * @property {string} [slug] - Form slug
- * @property {(asset?: string) => string} getAssetPath - Asset path resolver
  * @property {FormContext} [context] - the current form context
+ * @property {PluginOptions['viewContext']} [injectedViewContext] - the current form context
  */
 
 /**
@@ -34,8 +33,8 @@
  */
 
 /**
- * @import { CookieConsent } from '~/src/common/types.js'
  * @import { config } from '~/src/config/index.js'
  * @import { FormContext } from '~/src/server/plugins/engine/types.js'
+ * @import { PluginOptions } from '~/src/server/plugins/engine/plugin.js'
  */
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../../src/server/plugins/nunjucks/types.js"],"sourcesContent":["/**\n * @typedef {object} MacroOptions\n * @property {string} [callBlock] - Nunjucks call block content\n * @property {object} [params] - Nunjucks macro params\n */\n\n/**\n * @typedef {object} RenderOptions\n * @property {object} [context] - Nunjucks render context\n */\n\n/**\n * @typedef {object} ViewContext - Nunjucks view context\n * @property {string} appVersion - Application version\n * @property {string} assetPath - Asset path\n * @property {Partial<Config>} config - Application config properties\n * @property {CookieConsent} [cookieConsent] - Cookie consent preferences\n * @property {string} [crumb] - Cross-Site Request Forgery (CSRF) token\n * @property {string} [cspNonce] - Content Security Policy (CSP) nonce\n * @property {string} [currentPath] - Current path\n * @property {string} [previewMode] - Preview mode\n * @property {string} [slug] - Form slug\n * @property {(asset?: string) => string} getAssetPath - Asset path resolver\n * @property {FormContext} [context] - the current form context\n */\n\n/**\n * @typedef {ReturnType<typeof config['getProperties']>} Config - Application config properties\n */\n\n/**\n * @typedef NunjucksContext\n * @property {ViewContext} ctx - the current nunjucks view context\n */\n\n/**\n * @import { CookieConsent } from '~/src/common/types.js'\n * @import { config } from '~/src/config/index.js'\n * @import { FormContext } from '~/src/server/plugins/engine/types.js'\n */\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../../src/server/plugins/nunjucks/types.js"],"sourcesContent":["/**\n * @typedef {object} MacroOptions\n * @property {string} [callBlock] - Nunjucks call block content\n * @property {object} [params] - Nunjucks macro params\n */\n\n/**\n * @typedef {object} RenderOptions\n * @property {object} [context] - Nunjucks render context\n */\n\n/**\n * @typedef {object} ViewContext - Nunjucks view context\n * @property {string} appVersion - Application version\n * @property {string} [baseLayoutPath] - Base layout path\n * @property {Partial<Config>} config - Application config properties\n * @property {string} [crumb] - Cross-Site Request Forgery (CSRF) token\n * @property {string} [cspNonce] - Content Security Policy (CSP) nonce\n * @property {string} [currentPath] - Current path\n * @property {string} [previewMode] - Preview mode\n * @property {string} [slug] - Form slug\n * @property {FormContext} [context] - the current form context\n * @property {PluginOptions['viewContext']} [injectedViewContext] - the current form context\n */\n\n/**\n * @typedef {ReturnType<typeof config['getProperties']>} Config - Application config properties\n */\n\n/**\n * @typedef NunjucksContext\n * @property {ViewContext} ctx - the current nunjucks view context\n */\n\n/**\n * @import { config } from '~/src/config/index.js'\n * @import { FormContext } from '~/src/server/plugins/engine/types.js'\n * @import { PluginOptions } from '~/src/server/plugins/engine/plugin.js'\n */\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA","ignoreList":[]}

package/.server/server/routes/index.js

@@ -1,3 +1,2 @@
 export { default as publicRoutes } from "./public.js";
-export { default as healthRoute } from "./health.js";
 //# sourceMappingURL=index.js.map

package/.server/server/routes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["default","publicRoutes","healthRoute"],"sources":["../../../src/server/routes/index.ts"],"sourcesContent":["export { default as publicRoutes } from '~/src/server/routes/public.js'\nexport { default as healthRoute } from '~/src/server/routes/health.js'\n"],"mappings":"AAAA,SAASA,OAAO,IAAIC,YAAY;AAChC,SAASD,OAAO,IAAIE,WAAW","ignoreList":[]}
+{"version":3,"file":"index.js","names":["default","publicRoutes"],"sources":["../../../src/server/routes/index.ts"],"sourcesContent":["export { default as publicRoutes } from '~/src/server/routes/public.js'\n"],"mappings":"AAAA,SAASA,OAAO,IAAIC,YAAY","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/hapi/index.d.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.js","names":[],"sources":["../../../src/typings/hapi/index.d.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/unified-signatures */\n\nimport { type Plugin } from '@hapi/hapi'\nimport { type ServerYar, type Yar } from '@hapi/yar'\nimport { type Logger } from 'pino'\n\nimport { type FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport {\n  type FormRequest,\n  type FormRequestPayload\n} from '~/src/server/routes/types.js'\nimport { type CacheService } from '~/src/server/services/index.js'\n\ndeclare module '@hapi/hapi' {\n  // Here we are decorating Hapi interface types with\n  // props from plugins which doesn't export @types\n  interface PluginProperties {\n    crumb: {\n      generate?: (request: Request | FormRequest | FormRequestPayload) => string\n    }\n    'forms-engine-plugin': {\n      cacheService: CacheService\n    }\n  }\n\n  interface PluginsStates {\n    blankie?: {\n      nonces?: {\n        script?: string\n        style?: string\n      }\n    }\n  }\n\n  interface Request {\n    logger: Logger\n    yar: Yar\n  }\n\n  interface RequestApplicationState {\n    model?: FormModel\n  }\n\n  interface Server {\n    logger: Logger\n    yar: ServerYar\n  }\n\n  interface ServerApplicationState {\n    model?: FormModel\n    models: Map<string, { model: FormModel; updatedAt: Date }>\n  }\n}\n\ndeclare module '@hapi/scooter' {\n  declare const hapiScooter: {\n    plugin: Plugin\n  }\n\n  export = hapiScooter\n}\n\ndeclare module 'blankie' {\n  declare const blankie: {\n    plugin: Plugin<Record<string, boolean | string | string[]>>\n  }\n\n  export = blankie\n}\n\ndeclare module 'blipp' {\n  declare const blipp: {\n    plugin: Plugin\n  }\n\n  export = blipp\n}\n\ndeclare module 'hapi-pulse' {\n  declare const hapiPulse: {\n    plugin: Plugin<{\n      timeout: number\n    }>\n  }\n\n  export = hapiPulse\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"index.d.js","names":[],"sources":["../../../src/typings/hapi/index.d.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/unified-signatures */\n\nimport { type Plugin } from '@hapi/hapi'\nimport { type ServerYar, type Yar } from '@hapi/yar'\nimport { type Logger } from 'pino'\n\nimport { type FormModel } from '~/src/server/plugins/engine/models/index.js'\nimport { type context } from '~/src/server/plugins/engine/nunjucks.js'\nimport {\n  type FormRequest,\n  type FormRequestPayload\n} from '~/src/server/routes/types.js'\nimport { type CacheService } from '~/src/server/services/index.js'\n\ndeclare module '@hapi/hapi' {\n  // Here we are decorating Hapi interface types with\n  // props from plugins which doesn't export @types\n  interface PluginProperties {\n    crumb: {\n      generate?: (request: Request | FormRequest | FormRequestPayload) => string\n    }\n    'forms-engine-plugin': {\n      baseLayoutPath: string\n      cacheService: CacheService\n      viewContext: context\n    }\n  }\n\n  interface Request {\n    logger: Logger\n    yar: Yar\n  }\n\n  interface RequestApplicationState {\n    model?: FormModel\n  }\n\n  interface Server {\n    logger: Logger\n    yar: ServerYar\n  }\n\n  interface ServerApplicationState {\n    model?: FormModel\n    models: Map<string, { model: FormModel; updatedAt: Date }>\n  }\n}\n\ndeclare module '@hapi/scooter' {\n  declare const hapiScooter: {\n    plugin: Plugin\n  }\n\n  export = hapiScooter\n}\n\ndeclare module 'blankie' {\n  declare const blankie: {\n    plugin: Plugin<Record<string, boolean | string | string[]>>\n  }\n\n  export = blankie\n}\n\ndeclare module 'blipp' {\n  declare const blipp: {\n    plugin: Plugin\n  }\n\n  export = blipp\n}\n\ndeclare module 'hapi-pulse' {\n  declare const hapiPulse: {\n    plugin: Plugin<{\n      timeout: number\n    }>\n  }\n\n  export = hapiPulse\n}\n"],"mappings":"","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.10",
+  "version": "0.1.12",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -24,6 +24,7 @@
     "./file-form-service.js": "./.server/server/utils/file-form-service.js",
     "./controllers/*": "./.server/server/plugins/engine/pageControllers/*",
     "./services/*": "./.server/server/plugins/engine/services/*",
+    "./engine/*": "./.server/server/plugins/engine/*",
     "./package.json": "./package.json"
   },
   "scripts": {
@@ -62,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",
@@ -177,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",