@dwp/govuk-casa 9.7.0 → 10.1.0

package/dist/middleware/body-parser.js

@@ -1,8 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyBody = verifyBody;
-exports.default = bodyParserMiddleware;
-const express_1 = require("express");
+import { urlencoded as expressBodyParser } from "express";
 /**
  * @typedef {import("express").RequestHandler} RequestHandler
  * @access private
@@ -28,7 +24,7 @@ const rConstructor = /constructor[='"[\]]/i;
  * @returns {void}
  * @throws {Error} For invalid bodies
  */
-function verifyBody(req, res, buf, encoding) {
+export function verifyBody(req, res, buf, encoding) {
     const body = decodeURI(buf.toString(encoding)).replace(/[\s\u200B-\u200D\uFEFF]/g, "");
     if (rProto.test(body)) {
         throw new Error("Request body verification failed (__proto__)");
@@ -49,9 +45,9 @@ function verifyBody(req, res, buf, encoding) {
  * @param {number} opts.formMaxBytes Max bytes that should be read
  * @returns {RequestHandler[]} Middleware functions
  */
-function bodyParserMiddleware({ formMaxParams, formMaxBytes }) {
+export default function bodyParserMiddleware({ formMaxParams, formMaxBytes }) {
     return [
-        (0, express_1.urlencoded)({
+        expressBodyParser({
             extended: true,
             type: "application/x-www-form-urlencoded",
             inflate: true,
@@ -61,4 +57,3 @@ function bodyParserMiddleware({ formMaxParams, formMaxBytes }) {
         }),
     ];
 }
-//# sourceMappingURL=body-parser.js.map

package/dist/middleware/csrf.d.ts

@@ -13,3 +13,4 @@
  */
 export default function csrfMiddleware(): RequestHandler[];
 export type RequestHandler = import("express").RequestHandler;
+//# sourceMappingURL=csrf.d.ts.map

package/dist/middleware/csrf.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"csrf.d.ts","sourceRoot":"","sources":["../../src/middleware/csrf.js"],"names":[],"mappings":"AAEA;;;GAGG;AAEH;;;;;;;;GAQG;AACH,0CAFa,cAAc,EAAE,CAgB5B;6BA3BY,OAAO,SAAS,EAAE,cAAc"}

package/dist/middleware/csrf.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = csrfMiddleware;
-const csrf_sync_1 = require("csrf-sync");
+import { csrfSync } from "csrf-sync";
 /**
  * @typedef {import("express").RequestHandler} RequestHandler
  * @access private
@@ -15,9 +12,9 @@ const csrf_sync_1 = require("csrf-sync");
  *
  * @returns {RequestHandler[]} Middleware functions
  */
-function csrfMiddleware() {
-    const { csrfSynchronisedProtection } = (0, csrf_sync_1.csrfSync)({
-        getTokenFromRequest: (req) => req.body._csrf,
+export default function csrfMiddleware() {
+    const { csrfSynchronisedProtection } = csrfSync({
+        getTokenFromRequest: (req) => req.body?._csrf,
     });
     return [
         csrfSynchronisedProtection,
@@ -30,4 +27,3 @@ function csrfMiddleware() {
         },
     ];
 }
-//# sourceMappingURL=csrf.js.map

package/dist/middleware/data.d.ts

@@ -9,11 +9,9 @@
  * @param {Plan} opts.plan CASA Plan
  * @param {ContextEventHandler[]} opts.events Event handlers
  * @param {ContextIdGenerator} opts.contextIdGenerator Content ID generator
- * @param {boolean} ops.govukRebrand Govuk rebrand feature flag
- * @param opts.govukRebrand
  * @returns {RequestHandler[]} Middleware functions
  */
-export default function dataMiddleware({ plan, events, contextIdGenerator, govukRebrand, }: {
+export default function dataMiddleware({ plan, events, contextIdGenerator }: {
     plan: Plan;
     events: ContextEventHandler[];
     contextIdGenerator: ContextIdGenerator;
@@ -22,3 +20,4 @@ export type RequestHandler = import("express").RequestHandler;
 export type Plan = import("../casa.js").Plan;
 export type ContextEventHandler = import("../casa.js").ContextEventHandler;
 export type ContextIdGenerator = import("../casa.js").ContextIdGenerator;
+//# sourceMappingURL=data.d.ts.map

package/dist/middleware/data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/middleware/data.js"],"names":[],"mappings":"AAwCA;;;;;;;;;;;;GAYG;AACH,6EALG;IAAmB,IAAI,EAAf,IAAI;IACwB,MAAM,EAAlC,mBAAmB,EAAE;IACI,kBAAkB,EAA3C,kBAAkB;CAC1B,GAAU,cAAc,EAAE,CAsG5B;6BApJY,OAAO,SAAS,EAAE,cAAc;mBAKhC,OAAO,YAAY,EAAE,IAAI;kCAKzB,OAAO,YAAY,EAAE,mBAAmB;iCAKxC,OAAO,YAAY,EAAE,kBAAkB"}

package/dist/middleware/data.js

@@ -1,12 +1,6 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = dataMiddleware;
-const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
-const utils_js_1 = require("../lib/utils.js");
-const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
+import JourneyContext from "../lib/JourneyContext.js";
+import { validateUrlPath } from "../lib/utils.js";
+import waypointUrl from "../lib/waypoint-url.js";
 /**
  * @typedef {import("express").RequestHandler} RequestHandler
  * @access private
@@ -23,12 +17,18 @@ const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
  * @typedef {import("../casa.js").ContextIdGenerator} ContextIdGenerator
  * @access private
  */
+/**
+ * Get edit orgin
+ *
+ * @param {import("express").Request} req Express request
+ * @returns {string} Currently set edit origin
+ */
 const editOrigin = (req) => {
-    if (Object.hasOwn(req.query, "editorigin")) {
-        return (0, waypoint_url_js_1.default)({ waypoint: req.query.editorigin });
+    if (req.query && Object.hasOwn(req.query, "editorigin")) {
+        return waypointUrl({ waypoint: req.query.editorigin });
     }
     if (req.body && Object.hasOwn(req.body, "editorigin")) {
-        return (0, waypoint_url_js_1.default)({ waypoint: req.body.editorigin });
+        return waypointUrl({ waypoint: req.body.editorigin });
     }
     return "";
 };
@@ -43,11 +43,9 @@ const editOrigin = (req) => {
  * @param {Plan} opts.plan CASA Plan
  * @param {ContextEventHandler[]} opts.events Event handlers
  * @param {ContextIdGenerator} opts.contextIdGenerator Content ID generator
- * @param {boolean} ops.govukRebrand Govuk rebrand feature flag
- * @param opts.govukRebrand
  * @returns {RequestHandler[]} Middleware functions
  */
-function dataMiddleware({ plan, events, contextIdGenerator, govukRebrand, }) {
+export default function dataMiddleware({ plan, events, contextIdGenerator }) {
     return [
         (req, res, next) => {
             /* ------------------------------------------------ Request decorations */
@@ -58,25 +56,27 @@ function dataMiddleware({ plan, events, contextIdGenerator, govukRebrand, }) {
                 plan,
                 // Current journey context, loaded from session, specified by
                 // `contextid` request parameter
-                journeyContext: JourneyContext_js_1.default.extractContextFromRequest(req).addEventListeners(events),
+                journeyContext: JourneyContext.extractContextFromRequest(req).addEventListeners(events),
                 // Edit mode
-                editMode: (Object.hasOwn(req.query, "edit") &&
+                editMode: (req.query &&
+                    Object.hasOwn(req.query, "edit") &&
                     Object.hasOwn(req.query, "editorigin")) ||
-                    (Object.hasOwn(req.body, "edit") &&
+                    (req.body &&
+                        Object.hasOwn(req.body, "edit") &&
                         Object.hasOwn(req.body, "editorigin")),
                 editOrigin: editOrigin(req),
             };
             // Grab chosen language from session
             req.casa.journeyContext.nav.language = req.session.language;
             // Context ID generator
-            Object.defineProperty(req, JourneyContext_js_1.default.ID_GENERATOR_REQ_KEY, {
+            Object.defineProperty(req, JourneyContext.ID_GENERATOR_REQ_KEY, {
                 value: contextIdGenerator,
                 enumerable: false,
                 writable: false,
             });
             /* ------------------------------------------------- Template variables */
             // Capture mount URL that will be used in generating all browser URLs
-            const mountUrl = (0, utils_js_1.validateUrlPath)(`${req.baseUrl}/`.replace(/\/+/g, "/"));
+            const mountUrl = validateUrlPath(`${req.baseUrl}/`.replace(/\/+/g, "/"));
             // If this CASA app is mounted on a parameterised route, then all of its
             // static assets (served by `staticRouter`) will, by default, be served
             // from that dynamic path, for example:
@@ -96,7 +96,7 @@ function dataMiddleware({ plan, events, contextIdGenerator, govukRebrand, }) {
             // Router, the `baseUrl` is different in each case, so we cannot rely
             // on it to be consistent. Hence the need for this property, which will
             // always be the non-parameterised version of the baseUrl.
-            const staticMountUrl = (0, utils_js_1.validateUrlPath)(`${req.unparameterisedBaseUrl}/`.replace(/\/+/g, "/"));
+            const staticMountUrl = validateUrlPath(`${req.unparameterisedBaseUrl}/`.replace(/\/+/g, "/"));
             // CASA and userland templates
             res.locals.casa = {
                 mountUrl,
@@ -109,14 +109,13 @@ function dataMiddleware({ plan, events, contextIdGenerator, govukRebrand, }) {
             //   htmlLang = req.language is provided by i18n-http-middleware
             //   assetPath = used for linking to static assets in the govuk-frontend module
             res.locals.htmlLang = req.language;
-            const rebrandAssetPath = govukRebrand ? "/rebrand" : "";
-            res.locals.assetPath = `${staticMountUrl}govuk/assets${rebrandAssetPath}`;
+            res.locals.assetPath = `${staticMountUrl}govuk/assets`;
             // Function for building URLs. This will be curried with the `mountUrl`,
             // `journeyContext`, `edit` and `editOrigin` for convenience. This means
             // the template author does not have to be concerned about the current
             // "state" when generating URLs, but still has the ability to override
             // these curried defaults if needs be.
-            res.locals.waypointUrl = (args) => (0, waypoint_url_js_1.default)({
+            res.locals.waypointUrl = (args) => waypointUrl({
                 mountUrl,
                 journeyContext: req.casa.journeyContext,
                 edit: req.casa.editMode,
@@ -127,4 +126,3 @@ function dataMiddleware({ plan, events, contextIdGenerator, govukRebrand, }) {
         },
     ];
 }
-//# sourceMappingURL=data.js.map

package/dist/middleware/gather-fields.d.ts

@@ -1,6 +1,8 @@
 declare function _default({ waypoint, fields }: {
     waypoint: string;
     fields?: import("../lib/field").PageField[] | undefined;
-}): any[];
+}): RequestHandler[];
 export default _default;
 export type PageField = import("../lib/field").PageField;
+export type RequestHandler = import("express").RequestHandler;
+//# sourceMappingURL=gather-fields.d.ts.map

package/dist/middleware/gather-fields.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gather-fields.d.ts","sourceRoot":"","sources":["../../src/middleware/gather-fields.js"],"names":[],"mappings":"AA+Be,gDAJZ;IAAoB,QAAQ,EAApB,MAAM;IACY,MAAM;CAChC,GAAU,cAAc,EAAE,CAsC5B;;wBAzDY,OAAO,cAAc,EAAE,SAAS;6BAKhC,OAAO,SAAS,EAAE,cAAc"}

package/dist/middleware/gather-fields.js

@@ -1,18 +1,18 @@
-"use strict";
 // Gather the field data from `req.body` into the current JourneyContext
 // - Store in the current session
 // - Update the user's journey context with the new data
 // - Remove validation date of JourneyContext so it can re-evaluted
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
-const constants_js_1 = require("../lib/constants.js");
+import JourneyContext from "../lib/JourneyContext.js";
+import NullObject from "../lib/NullObject.js";
+import { REQUEST_PHASE_GATHER } from "../lib/constants.js";
 /**
  * @typedef {import("../lib/field").PageField} PageField
  * @access private
  */
+/**
+ * @typedef {import("express").RequestHandler} RequestHandler
+ * @access private
+ */
 /**
  * Gather the field data from `req.body` into the current JourneyContext
  *
@@ -23,17 +23,17 @@ const constants_js_1 = require("../lib/constants.js");
  * @param {object} obj Options
  * @param {string} obj.waypoint Waypoint
  * @param {PageField[]} [obj.fields] Fields. Default is `[]`
- * @returns {Array} Array of middleware
+ * @returns {RequestHandler[]} Array of middleware
  */
-exports.default = ({ waypoint, fields = [] }) => [
+export default ({ waypoint, fields = [] }) => [
     (req, res, next) => {
         // Store a copy of the journey context before modifying it. This is useful
         // for any comparison work that may be done in subsequent middleware.
-        req.casa.archivedJourneyContext = JourneyContext_js_1.default.fromContext(req.casa.journeyContext, req);
+        req.casa.archivedJourneyContext = JourneyContext.fromContext(req.casa.journeyContext, req);
         // Ignore data for any non-persistent fields
         // ESLint disabled as `fields`, `i` and `name` are dev-controlled
         /* eslint-disable security/detect-object-injection */
-        const persistentBody = Object.create(null);
+        const persistentBody = new NullObject();
         for (let i = 0, l = fields.length; i < l; i++) {
             if (fields[i].meta.persist &&
                 fields[i].getValue(req.body) !== undefined) {
@@ -46,12 +46,11 @@ exports.default = ({ waypoint, fields = [] }) => [
         // data is invalid until proven otherwise when the validation step is run.
         req.casa.journeyContext.setDataForPage(waypoint, persistentBody);
         req.casa.journeyContext.removeValidationStateForPage(waypoint);
-        JourneyContext_js_1.default.putContext(req.session, req.casa.journeyContext, {
+        JourneyContext.putContext(req.session, req.casa.journeyContext, {
             userInfo: {
-                casaRequestPhase: constants_js_1.REQUEST_PHASE_GATHER,
+                casaRequestPhase: REQUEST_PHASE_GATHER,
             },
         });
         next();
     },
 ];
-//# sourceMappingURL=gather-fields.js.map

package/dist/middleware/i18n.d.ts

@@ -13,3 +13,4 @@ export default function i18nMiddleware({ languages, fallbackLng, directories, }:
     directories?: string[] | undefined;
 }): RequestHandler[];
 export type RequestHandler = import("express").RequestHandler;
+//# sourceMappingURL=i18n.d.ts.map

package/dist/middleware/i18n.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/middleware/i18n.js"],"names":[],"mappings":"AAyEA;;;;;;;;GAQG;AACH,iFALG;IAAwB,SAAS;IACT,WAAW;IACX,WAAW;CACnC,GAAU,cAAc,EAAE,CA+C5B;6BArHY,OAAO,SAAS,EAAE,cAAc"}

package/dist/middleware/i18n.js

@@ -1,59 +1,55 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = i18nMiddleware;
-const i18next_1 = require("i18next");
-const i18next_http_middleware_1 = require("i18next-http-middleware");
-const node_path_1 = require("node:path");
-const node_fs_1 = require("node:fs");
-const deepmerge_1 = __importDefault(require("deepmerge"));
-const js_yaml_1 = require("js-yaml");
-const logger_js_1 = __importDefault(require("../lib/logger.js"));
+import { createInstance } from "i18next";
+import { LanguageDetector, handle } from "i18next-http-middleware";
+import { resolve, basename } from "node:path";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
+import deepmerge from "@fastify/deepmerge";
+import { load as jsYamlLoad } from "js-yaml";
+import logger from "../lib/logger.js";
+import NullObject from "../lib/NullObject.js";
 /**
  * @typedef {import("express").RequestHandler} RequestHandler
  * @access private
  */
-const log = (0, logger_js_1.default)("middleware:i18n");
+const log = logger("middleware:i18n");
+const merge = deepmerge({ onlyDefinedProperties: true });
 const loadJson = (file) => {
     // Strip out newlines (this is a legacy feature which we're keeping for
     // backwards compatibility).
     /* eslint-disable-next-line security/detect-non-literal-fs-filename */
-    const json = (0, node_fs_1.readFileSync)(file, "utf8");
+    const json = readFileSync(file, "utf8");
     return JSON.parse(json.replace(/[\r\n]/g, ""));
 };
 /* eslint-disable-next-line security/detect-non-literal-fs-filename */
-const loadYaml = (file) => (0, js_yaml_1.load)((0, node_fs_1.readFileSync)(file, "utf8"));
+const loadYaml = (file) => jsYamlLoad(readFileSync(file, "utf8"));
 const extract = (file) => {
     const ext = /.yaml$/i.test(file) ? ".yaml" : ".json";
     const data = ext === ".yaml" ? loadYaml(file) : loadJson(file);
     return {
-        ns: (0, node_path_1.basename)(file, ext),
+        ns: basename(file, ext),
         data,
     };
 };
 const loadResources = (languages, directories) => {
-    const store = Object.create(null);
+    const store = new NullObject();
     for (const language of languages) {
         // ESLint disabled as `store`, `language` and `ns` are all dev-controlled,
         // and this function is only called once, at boot-time.
         /* eslint-disable security/detect-object-injection */
-        store[language] = Object.create(null);
+        store[language] = new NullObject();
         for (const basedir of directories) {
-            const dir = (0, node_path_1.resolve)(basedir, language);
+            const dir = resolve(basedir, language);
             /* eslint-disable-next-line security/detect-non-literal-fs-filename */
-            if (!(0, node_fs_1.existsSync)(dir)) {
+            if (!existsSync(dir)) {
                 continue;
             }
             log.info("Loading %s language from %s ...", language, dir);
             /* eslint-disable-next-line security/detect-non-literal-fs-filename */
-            for (const file of (0, node_fs_1.readdirSync)(dir)) {
-                const { ns, data } = extract((0, node_path_1.resolve)(dir, file));
+            for (const file of readdirSync(dir)) {
+                const { ns, data } = extract(resolve(dir, file));
                 if (store[language][ns] === undefined) {
-                    store[language][ns] = Object.create(null);
+                    store[language][ns] = new NullObject();
                 }
-                store[language][ns] = (0, deepmerge_1.default)(store[language][ns], data);
+                store[language][ns] = merge(store[language][ns], data);
             }
         }
         /* eslint-enable security/detect-object-injection */
@@ -69,12 +65,12 @@ const loadResources = (languages, directories) => {
  * @param {string[]} [opts.directories] Source translations directories
  * @returns {RequestHandler[]} Middleware functions
  */
-function i18nMiddleware({ languages = ["en", "cy"], fallbackLng = false, directories = [], }) {
+export default function i18nMiddleware({ languages = ["en", "cy"], fallbackLng = false, directories = [], }) {
     // Load _all_ translations, from all directories into memory.
     const resources = loadResources(languages, directories);
     // Configure i18next
-    const i18nInstance = (0, i18next_1.createInstance)();
-    i18nInstance.use(i18next_http_middleware_1.LanguageDetector).init({
+    const i18nInstance = createInstance();
+    i18nInstance.use(LanguageDetector).init({
         initAsync: false, // because we need synchronous loading
         supportedLngs: languages,
         fallbackLng,
@@ -98,12 +94,11 @@ function i18nMiddleware({ languages = ["en", "cy"], fallbackLng = false, directo
             if (!req.session.language) {
                 req.session.language = languages[0];
             }
-            if (req?.query.lang && languages.includes(req.query.lang)) {
+            if (req.query?.lang && languages.includes(req.query.lang)) {
                 req.session.language = String(req.query.lang);
             }
             next();
         },
-        (0, i18next_http_middleware_1.handle)(i18nInstance),
+        handle(i18nInstance),
     ];
 }
-//# sourceMappingURL=i18n.js.map

package/dist/middleware/post.d.ts

@@ -1,3 +1,5 @@
-/** @returns {RequestHandler[]} Middleware functions */
-export default function postMiddleware(): RequestHandler[];
+/** @returns {[RequestHandler, ErrorRequestHandler]} Middleware functions */
+export default function postMiddleware(): [RequestHandler, ErrorRequestHandler];
 export type RequestHandler = import("express").RequestHandler;
+export type ErrorRequestHandler = import("express").ErrorRequestHandler;
+//# sourceMappingURL=post.d.ts.map

package/dist/middleware/post.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../src/middleware/post.js"],"names":[],"mappings":"AAYA,4EAA4E;AAC5E,0CADc,CAAC,cAAc,EAAE,mBAAmB,CAAC,CA4ElD;6BApFY,OAAO,SAAS,EAAE,cAAc;kCAEhC,OAAO,SAAS,EAAE,mBAAmB"}

package/dist/middleware/post.js

@@ -1,18 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = postMiddleware;
 // 2 middleware: one as a fallback 404 handler, one to handle thrown errors
-const logger_js_1 = __importDefault(require("../lib/logger.js"));
+import logger from "../lib/logger.js";
 /**
  * @typedef {import("express").RequestHandler} RequestHandler
+ *
+ * @typedef {import("express").ErrorRequestHandler} ErrorRequestHandler
  * @access private
  */
-const log = (0, logger_js_1.default)("middleware:post");
-/** @returns {RequestHandler[]} Middleware functions */
-function postMiddleware() {
+const log = logger("middleware:post");
+/** @returns {[RequestHandler, ErrorRequestHandler]} Middleware functions */
+export default function postMiddleware() {
     return [
         (req, res) => {
             res.status(404).render("casa/errors/404.njk");
@@ -74,4 +70,3 @@ function postMiddleware() {
         },
     ];
 }
-//# sourceMappingURL=post.js.map

package/dist/middleware/pre.d.ts

@@ -1,5 +1,6 @@
 declare function _default({ helmetConfigurator }?: {
     helmetConfigurator: HelmetConfigurator;
-}): Function[];
+}): import("express").RequestHandler[];
 export default _default;
 export type HelmetConfigurator = import("../casa").HelmetConfigurator;
+//# sourceMappingURL=pre.d.ts.map

package/dist/middleware/pre.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pre.d.ts","sourceRoot":"","sources":["../../src/middleware/pre.js"],"names":[],"mappings":"AAqCe,mDAJZ;IAAiC,kBAAkB,EAA3C,kBAAkB;CAE1B,GAAU,OAAO,SAAS,EAAE,cAAc,EAAE,CA4E9C;;iCA3GY,OAAO,SAAS,EAAE,kBAAkB"}

package/dist/middleware/pre.js

@@ -1,10 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_crypto_1 = require("node:crypto");
-const helmet_1 = __importDefault(require("helmet"));
+import { randomBytes } from "node:crypto";
+import helmet from "helmet";
 /**
  * @typedef {import("../casa").HelmetConfigurator} HelmetConfigurator
  * @access private
@@ -34,9 +29,9 @@ function casaCspNonce(req, res) {
  * @param {object} opts Options
  * @param {HelmetConfigurator} opts.helmetConfigurator Function to customise
  *   Helmet configuration
- * @returns {Function[]} List of middleware
+ * @returns {import("express").RequestHandler[]} List of middleware
  */
-exports.default = ({ helmetConfigurator = (config) => config } = {}) => [
+export default ({ helmetConfigurator = (config) => config } = {}) => [
     // Only allow certain request methods
     (req, res, next) => {
         if (req.method !== "GET" && req.method !== "POST") {
@@ -61,11 +56,11 @@ exports.default = ({ helmetConfigurator = (config) => config } = {}) => [
     // Generate nonces ready for use in Content-Security-Policy header and
     // govuk-frontend template. This same none can be used wherever required.
     (req, res, next) => {
-        res.locals.cspNonce = (0, node_crypto_1.randomBytes)(16).toString("hex");
+        res.locals.cspNonce = randomBytes(16).toString("hex");
         next();
     },
     // Helmet suite of headers
-    (0, helmet_1.default)(helmetConfigurator({
+    helmet(helmetConfigurator({
         // Allows GA which is typically used, and a known inline script nonce
         contentSecurityPolicy: {
             useDefaults: true,
@@ -104,4 +99,3 @@ exports.default = ({ helmetConfigurator = (config) => config } = {}) => [
         // referrerPolicy: 'no-referrer, same-origin',
     })),
 ];
-//# sourceMappingURL=pre.js.map

package/dist/middleware/progress-journey.d.ts

@@ -1,5 +1,7 @@
 declare function _default({ waypoint, plan }: {
-    waypoint: any;
-    plan: any;
-}): ((req: any, res: any, next: any) => void)[];
+    waypoint: string;
+    plan: Plan;
+}): import("express").RequestHandler[];
 export default _default;
+import Plan from "../lib/Plan.js";
+//# sourceMappingURL=progress-journey.d.ts.map

package/dist/middleware/progress-journey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress-journey.d.ts","sourceRoot":"","sources":["../../src/middleware/progress-journey.js"],"names":[],"mappings":"AAmCe,8CAJZ;IAAqB,QAAQ,EAArB,MAAM;IACK,IAAI,EAAf,IAAI;CACZ,GAAU,OAAO,SAAS,EAAE,cAAc,EAAE,CAoF9C;;iBAjHgB,gBAAgB"}

package/dist/middleware/progress-journey.js

@@ -1,21 +1,16 @@
-"use strict";
 // Determine where to take the user next
 // We assume that the waypoint has been validated prior to reaching this
 // middleware.
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Plan_js_1 = __importDefault(require("../lib/Plan.js"));
-const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
-const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
-const logger_js_1 = __importDefault(require("../lib/logger.js"));
-const constants_js_1 = require("../lib/constants.js");
-const log = (0, logger_js_1.default)("middleware:progress-journey");
+import Plan from "../lib/Plan.js";
+import JourneyContext from "../lib/JourneyContext.js";
+import waypointUrl from "../lib/waypoint-url.js";
+import logger from "../lib/logger.js";
+import { REQUEST_PHASE_REDIRECT } from "../lib/constants.js";
+const log = logger("middleware:progress-journey");
 const saveAndRedirect = (session, journeyContext, url, res, next) => {
-    JourneyContext_js_1.default.putContext(session, journeyContext, {
+    JourneyContext.putContext(session, journeyContext, {
         userInfo: {
-            casaRequestPhase: constants_js_1.REQUEST_PHASE_REDIRECT,
+            casaRequestPhase: REQUEST_PHASE_REDIRECT,
         },
     });
     session.save((err) => {
@@ -25,7 +20,15 @@ const saveAndRedirect = (session, journeyContext, url, res, next) => {
         res.redirect(302, url);
     });
 };
-exports.default = ({ waypoint, plan }) => [
+/**
+ * Get "progress journey" middleware for a given waypoint
+ *
+ * @param {object} opts Options
+ * @param {string} opts.waypoint Waypoint
+ * @param {Plan} opts.plan CASA Plan
+ * @returns {import("express").RequestHandler[]} Middleware functions
+ */
+export default ({ waypoint, plan }) => [
     (req, res, next) => {
         // Determine the next available waypoint after the current one
         const traversed = plan.traverse(req.casa.journeyContext);
@@ -51,7 +54,7 @@ exports.default = ({ waypoint, plan }) => [
             const url = new URL(req.casa.editOrigin, "https://placeholder.test/");
             url.searchParams.append("edit", "true");
             url.searchParams.append("editorigin", req.casa.editOrigin);
-            const redirectUrl = (0, waypoint_url_js_1.default)({ waypoint: url.pathname }) + url.search.toString();
+            const redirectUrl = waypointUrl({ waypoint: url.pathname }) + url.search.toString();
             log.debug(`Edit mode detected; redirecting to ${redirectUrl}`);
             return saveAndRedirect(req.session, req.casa.journeyContext, redirectUrl, res, next);
         }
@@ -65,12 +68,12 @@ exports.default = ({ waypoint, plan }) => [
         //   setRoute('a', 'b');
         //   setRoute('b', 'url:///otherapp/')
         //   setRoute('url:////otherapp/', 'c', (r, c) => checkIfOtherAppIsFinished())
-        if (Plan_js_1.default.isExitNode(nextWaypoint)) {
+        if (Plan.isExitNode(nextWaypoint)) {
             log.trace(`Next waypoint is an exit node; clearing validation state on ${nextWaypoint}`);
             req.casa.journeyContext.clearValidationErrorsForPage(nextWaypoint);
         }
         // Construct the next url
-        const nextUrl = (0, waypoint_url_js_1.default)({
+        const nextUrl = waypointUrl({
             waypoint: nextWaypoint,
             mountUrl: `${req.baseUrl}/`,
             journeyContext: req.casa.journeyContext,
@@ -82,4 +85,3 @@ exports.default = ({ waypoint, plan }) => [
         return saveAndRedirect(req.session, req.casa.journeyContext, nextUrl, res, next);
     },
 ];
-//# sourceMappingURL=progress-journey.js.map

package/dist/middleware/sanitise-fields.d.ts

@@ -1,5 +1,7 @@
 declare function _default({ waypoint, fields }: {
-    waypoint: any;
-    fields?: never[] | undefined;
-}): ((req: any, res: any, next: any) => void)[];
+    waypoint: string;
+    fields: PageField[];
+}): import("express").RequestHandler[];
 export default _default;
+export type PageField = import("../casa").PageField;
+//# sourceMappingURL=sanitise-fields.d.ts.map

package/dist/middleware/sanitise-fields.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitise-fields.d.ts","sourceRoot":"","sources":["../../src/middleware/sanitise-fields.js"],"names":[],"mappings":"AAgBe,gDAJZ;IAAqB,QAAQ,EAArB,MAAM;IACY,MAAM,EAAxB,SAAS,EAAE;CACnB,GAAU,OAAO,SAAS,EAAE,cAAc,EAAE,CA2E9C;;wBAGY,OAAO,SAAS,EAAE,SAAS"}