@dwp/govuk-casa 7.0.6 → 8.0.0-alpha1

package/dist/middleware/skip-waypoint.js

@@ -0,0 +1,40 @@
+"use strict";
+// Mark a waypoint as skipped
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
+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 log = (0, logger_js_1.default)('middleware:skip-waypoint');
+exports.default = ({ waypoint, mountUrl, }) => [
+    (req, res, next) => {
+        if (!(0, lodash_1.has)(req.query, 'skipto')) {
+            return next();
+        }
+        const skipTo = String(req.query.skipto);
+        // Inject a special `__skipped__` attribute into this waypoint's data
+        log.info(`Marking waypoint "${waypoint}" as skipped`);
+        req.casa.journeyContext.clearValidationErrorsForPage(waypoint);
+        req.casa.journeyContext.setDataForPage(waypoint, {
+            __skipped__: true,
+        });
+        JourneyContext_js_1.default.putContext(req.session, req.casa.journeyContext);
+        const redirectUrl = (0, waypoint_url_js_1.default)({
+            mountUrl,
+            waypoint: skipTo,
+            edit: req.editMode,
+            editOrigin: req.editOriginUrl,
+            journeyContext: req.casa.journeyContext,
+        });
+        log.debug(`Will redirect to "${redirectUrl}" after skipping "${waypoint}"`);
+        req.session.save((err) => {
+            if (err) {
+                return next(err);
+            }
+            res.redirect(302, redirectUrl);
+        });
+    },
+];

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

@@ -0,0 +1,6 @@
+declare function _default({ waypoint, plan, mountUrl, }: {
+    waypoint: string;
+    plan: any;
+    mountUrl: string;
+}): ((req: any, res: any, next: any) => any)[];
+export default _default;

package/dist/middleware/steer-journey.js

@@ -0,0 +1,44 @@
+"use strict";
+// This sits in front of all other middleware and prevents the user from
+// "jumping ahead" in the Plan.
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
+const logger_js_1 = __importDefault(require("../lib/logger.js"));
+const log = (0, logger_js_1.default)('middleware:steer-journey');
+/**
+ * @param {Object} obj
+ * @param {string} obj.waypoint
+ * @param {Plan} obj.plan
+ * @param {string} obj.mountUrl
+ */
+exports.default = ({ waypoint, plan, mountUrl, }) => [
+    (req, res, next) => {
+        // If the requested waypoint doesn't exist in the traversed journey, send
+        // the user back to the last good waypoint.
+        const traversed = plan.traverse(req.casa.journeyContext);
+        if (traversed.indexOf(waypoint) === -1) {
+            const redirectTo = traversed[traversed.length - 1];
+            log.trace(`Attempted to access "${waypoint}" when not in the journey; redirecting to "${redirectTo}"`);
+            return res.redirect(302, (0, waypoint_url_js_1.default)({
+                waypoint: redirectTo,
+                mountUrl,
+                journeyContext: req.casa.journeyContext,
+                edit: req.casa.editMode,
+                editOrigin: req.casa.editOrigin,
+            }));
+        }
+        // difficult: first waypoint on a Plan - how do we determine if there are other plans pointing at this one?
+        // and how do we determine if those others are part of a future plan, or a past one?
+        // Think we'll have to leave it up to the dev to add the back link for the first page in a Plan.
+        // Calculate URL for the "back" link
+        const [prevRoute] = plan.traversePrevRoutes(req.casa.journeyContext, {
+            startWaypoint: waypoint,
+            stopCondition: () => (true), // stop at the first one
+        });
+        res.locals.casa.journeyPreviousUrl = prevRoute.target ? (0, waypoint_url_js_1.default)({ mountUrl, waypoint: prevRoute.target, routeName: 'prev' }) : undefined;
+        next();
+    },
+];

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

@@ -0,0 +1,7 @@
+declare function _default({ waypoint, fields, mountUrl, plan, }: {
+    waypoint: any;
+    fields?: any[] | undefined;
+    mountUrl: any;
+    plan: any;
+}): ((req: any, res: any, next: any) => any)[];
+export default _default;

package/dist/middleware/validate-fields.js

@@ -0,0 +1,76 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// Validate the data captured in the journey context
+const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
+const updateContext = ({ waypoint, errors = null, plan, mountUrl, journeyContext, session, }) => {
+    // Set validation state
+    if (errors === null) {
+        journeyContext.clearValidationErrorsForPage(waypoint);
+    }
+    else {
+        journeyContext.setValidationErrorsForPage(waypoint, errors);
+    }
+    // // Update nav context
+    // // In most cases, the "next" & "prev" routes will result in the same sequence,
+    // // in reverse. But devs do have the option of setting different logic on
+    // // these routes, so this is the proper way to do it.
+    // const traversedNext = plan.traverseNextRoutes(journeyContext).map(r => r.source);
+    // const traversedPrev = plan.traversePrevRoutes(journeyContext, {
+    //   startWaypoint: traversedNext[traversedNext.length - 1],
+    // }).map(r => r.source);
+    // journeyContext.setNavigationUrls(mountUrl, traversedNext, 'next');
+    // journeyContext.setNavigationUrls(mountUrl, traversedPrev, 'prev');
+    // Save to session
+    JourneyContext_js_1.default.putContext(session, journeyContext);
+};
+exports.default = ({ waypoint, fields = [], mountUrl, plan, }) => [
+    (req, res, next) => {
+        var _a, _b;
+        let errors = [];
+        for (let i = 0, l = fields.length; i < l; i++) {
+            const field = fields[i];
+            const fieldName = field.name;
+            const fieldValue = (_b = (_a = req.casa.journeyContext.data) === null || _a === void 0 ? void 0 : _a[waypoint]) === null || _b === void 0 ? void 0 : _b[fieldName];
+            const context = {
+                fieldName,
+                fieldValue,
+                waypoint,
+                journeyContext: req.casa.journeyContext,
+            };
+            if (!field.testConditions(context))
+                continue;
+            errors = [
+                ...errors,
+                ...field.runValidators(fieldValue, context),
+            ];
+        }
+        // Validation passed with no errors
+        if (!errors.length) {
+            updateContext({
+                waypoint,
+                session: req.session,
+                mountUrl,
+                plan,
+                journeyContext: req.casa.journeyContext,
+            });
+            return next();
+        }
+        // If there are any native errors in the list, we need to bail the request
+        if (errors.find((e) => e instanceof Error)) {
+            return next(e);
+        }
+        // Make the errors available to downstream middleware
+        updateContext({
+            errors,
+            waypoint,
+            session: req.session,
+            mountUrl,
+            plan,
+            journeyContext: req.casa.journeyContext,
+        });
+        next();
+    }
+];

package/dist/mjs/esm-wrapper.js

@@ -0,0 +1,10 @@
+// Basic wrapper to act as the package entrypoint for ESM applications
+// ref: https://redfin.engineering/node-modules-at-war-why-commonjs-and-es-modules-cant-get-along-9617135eeca1
+import casa from '../casa.js';
+export const configure = casa.configure; 
+export const validators = casa.validators;
+export const field = casa.field;
+export const Plan = casa.Plan;
+export const JourneyContext = casa.JourneyContext;
+export const ValidationError = casa.ValidationError;
+export const waypointUrl = casa.waypointUrl;

package/dist/mjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/dist/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

package/dist/routes/ancillary.d.ts

@@ -0,0 +1,4 @@
+export default function ancillaryRouter({ sessionTtl, }: {
+    sessionTtl: any;
+}): MutableRouter;
+import MutableRouter from "../lib/MutableRouter.js";

package/dist/routes/ancillary.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
+function ancillaryRouter({ sessionTtl, }) {
+    // Router
+    const router = new MutableRouter_js_1.default();
+    // Session timeout
+    // TODO: add a `ancillary.presessiontimeout` hook here? Might be useful for those who way to enhance the timeout route, rather than replacing it completely
+    router.all('/session-timeout', (req, res) => {
+        res.render('casa/session-timeout.njk', {
+            sessionTtl: Math.floor(sessionTtl / 60),
+        });
+    });
+    return router;
+}
+exports.default = ancillaryRouter;

package/dist/routes/dirname.cjs

@@ -0,0 +1 @@
+module.exports = __dirname;

package/dist/routes/journey.d.ts

@@ -0,0 +1,8 @@
+export default function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, mountUrl, }: {
+    globalHooks: any;
+    pages: any;
+    plan: any;
+    csrfMiddleware: any;
+    mountUrl: any;
+}): MutableRouter;
+import MutableRouter from "../lib/MutableRouter.js";

package/dist/routes/journey.js

@@ -0,0 +1,130 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable object-curly-newline,max-len */
+const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
+const skip_waypoint_js_1 = __importDefault(require("../middleware/skip-waypoint.js"));
+const steer_journey_js_1 = __importDefault(require("../middleware/steer-journey.js"));
+const sanitise_fields_js_1 = __importDefault(require("../middleware/sanitise-fields.js"));
+const gather_fields_js_1 = __importDefault(require("../middleware/gather-fields.js"));
+const validate_fields_js_1 = __importDefault(require("../middleware/validate-fields.js"));
+const progress_journey_js_1 = __importDefault(require("../middleware/progress-journey.js"));
+const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
+const logger_js_1 = __importDefault(require("../lib/logger.js"));
+const log = (0, logger_js_1.default)('router:journey');
+const resolveHooks = (hookName, waypoint, pageHooks, globalHooks = []) => {
+    const waypointPath = `/${waypoint}`;
+    const pathMatch = (h) => h.path === undefined || (h.path instanceof RegExp && h.path.test(waypointPath)) || h.path === waypointPath;
+    const matchedPageHooks = (pageHooks || []).filter((h) => `journey.${h.hook}` === hookName).map((h) => h.middleware);
+    const matchedGlobalHooks = globalHooks.filter((h) => h.hook === hookName).filter(pathMatch).map((h) => h.middleware);
+    return [
+        ...matchedGlobalHooks,
+        ...matchedPageHooks,
+    ];
+};
+const renderMiddlewareFactory = (view, contextFactory) => [
+    (req, res, next) => {
+        res.render(view, Object.assign({ 
+            // Common template variables for both GET and POST requests
+            inEditMode: req.casa.editMode, editOriginUrl: req.casa.editOrigin, 
+            // editSearchParams: req.editSearchParams,
+            activeContextId: req.casa.journeyContext.identity.id }, contextFactory(req)), (err, templateString) => {
+            if (err) {
+                // logger.error(err);
+                next(err);
+            }
+            else {
+                res.send(templateString);
+            }
+        });
+    },
+];
+function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, mountUrl, }) {
+    // Router
+    const router = new MutableRouter_js_1.default();
+    // Special "_" route which handles redirecting the user between sub-apps
+    // /app1/_/?refmount=app2&route=prev
+    //   - will redirect to the 
+    router.all('/_', (req, res) => {
+        var _a, _b;
+        const refmount = (_a = req.query) === null || _a === void 0 ? void 0 : _a.refmount;
+        const route = (_b = req.query) === null || _b === void 0 ? void 0 : _b.route;
+        log.trace(`App root ${mountUrl}: refmount = ${refmount}, route = ${route}`);
+        let redirectTo;
+        const fallback = (0, waypoint_url_js_1.default)({
+            mountUrl,
+            waypoint: plan.traverse(req.casa.journeyContext, {
+                stopCondition: () => (true), // we only need one; stop at the first
+            })[0],
+        });
+        if (route === 'prev') {
+            const routes = plan.traversePrevRoutes(req.casa.journeyContext, { startWaypoint: refmount });
+            redirectTo = routes.length ? (0, waypoint_url_js_1.default)({ mountUrl, waypoint: routes[0].target }) : fallback;
+        }
+        else {
+            const routes = plan.traverseNextRoutes(req.casa.journeyContext, { startWaypoint: refmount });
+            if (routes[0].target !== null) {
+                redirectTo = routes.length ? (0, waypoint_url_js_1.default)({ mountUrl, waypoint: routes[0].target }) : fallback;
+            }
+            else {
+                redirectTo = fallback;
+            }
+        }
+        // Carry over any params
+        const url = new URL(redirectTo, 'https://placeholder.test/');
+        const searchParams = new URLSearchParams(req.query);
+        searchParams.delete('refmount');
+        searchParams.delete('route');
+        url.search = searchParams.toString();
+        redirectTo = `${url.pathname.replace(/\/+/g, '/')}${url.search}`;
+        log.trace(`Redirect to ${redirectTo}`);
+        return res.redirect(redirectTo);
+    });
+    // Create GET / POST routes for each page
+    const commonMiddleware = [
+        ...csrfMiddleware,
+    ];
+    pages.forEach((page) => {
+        const { waypoint, view, hooks: pageHooks, fields } = page;
+        const formUrl = (0, waypoint_url_js_1.default)({ mountUrl, waypoint });
+        const waypointPath = `/${waypoint}`;
+        const commonWaypointMiddleware = [
+            (req, res, next) => {
+                req.casa.waypoint = waypoint;
+                next();
+            },
+            ...(0, skip_waypoint_js_1.default)({ mountUrl, waypoint }),
+        ];
+        router.get(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...resolveHooks('journey.presteer', waypoint, pageHooks, globalHooks), ...(0, steer_journey_js_1.default)({ waypoint, mountUrl, plan }), ...resolveHooks('journey.poststeer', waypoint, pageHooks, globalHooks), ...resolveHooks('journey.prerender', waypoint, pageHooks, globalHooks), renderMiddlewareFactory(view, (req) => ({
+            formUrl,
+            formData: req.casa.journeyContext.getDataForPage(waypoint),
+        })));
+        router.post(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...resolveHooks('journey.presteer', waypoint, pageHooks, globalHooks), ...(0, steer_journey_js_1.default)({ waypoint, mountUrl, plan }), ...resolveHooks('journey.poststeer', waypoint, pageHooks, globalHooks), ...resolveHooks('journey.presanitise', waypoint, pageHooks, globalHooks), ...(0, sanitise_fields_js_1.default)({ waypoint, fields }), ...resolveHooks('journey.postsanitise', waypoint, pageHooks, globalHooks), ...resolveHooks('journey.pregather', waypoint, pageHooks, globalHooks), ...(0, gather_fields_js_1.default)({ waypoint, fields }), ...resolveHooks('journey.postgather', waypoint, pageHooks, globalHooks), ...resolveHooks('journey.prevalidate', waypoint, pageHooks, globalHooks), ...(0, validate_fields_js_1.default)({ waypoint, fields, mountUrl, plan }), ...resolveHooks('journey.postvalidate', waypoint, pageHooks, globalHooks), 
+        // If there were validation errors, jump out of this route and into the
+        // next, where the errors will be rendered
+        (req, res, next) => (req.casa.journeyContext.hasValidationErrorsForPage(waypoint) ? next('route') : next()), ...resolveHooks('journey.preredirect', waypoint, pageHooks, globalHooks), ...(0, progress_journey_js_1.default)({ waypoint, plan, mountUrl }));
+        router.post(waypointPath, ...resolveHooks('journey.prerender', waypoint, pageHooks, globalHooks), renderMiddlewareFactory(view, (req) => {
+            var _a;
+            const errors = (_a = req.casa.journeyContext.getValidationErrorsForPageByField(waypoint)) !== null && _a !== void 0 ? _a : Object.create(null);
+            // This is a convenience for the template. The `govukErrorSummary` macro
+            // requires the errors be in a particular format, so here we provide our
+            // errors in that format.
+            // Where there are multiple errors against a particular field, only the
+            // first one is shown.
+            const govukErrors = Object.keys(errors).map((k) => ({
+                text: req.t(errors[k][0].summary, errors[k][0].variables),
+                href: errors[k][0].fieldHref,
+            }));
+            return {
+                formUrl,
+                formData: req.body,
+                formErrors: Object.keys(errors).length ? errors : null,
+                formErrorsGovukArray: govukErrors.length ? govukErrors : null,
+            };
+        }));
+    });
+    return router;
+}
+exports.default = journeyRouter;

package/dist/routes/static.d.ts

@@ -0,0 +1,26 @@
+/**
+ * @typedef {object} StaticOptions Options to configure static router
+ * @property {string} [mountUrl=/] URL prefix for govuk-frontend static assets (optional, default /)
+ * @property {number} [maxAge=3600000] Cache TTL for all assets (optional, default 1 hour)
+ */
+/**
+ * Create a router for serving CASA's static assets.
+ *
+ * @param {StaticOptions} options Options
+ * @returns {MutableRouter} ExpressJS Router instance
+ */
+export default function staticRouter({ mountUrl, maxAge, }: StaticOptions): MutableRouter;
+/**
+ * Options to configure static router
+ */
+export type StaticOptions = {
+    /**
+     * )
+     */
+    mountUrl?: string | undefined;
+    /**
+     * Cache TTL for all assets (optional, default 1 hour)
+     */
+    maxAge?: number | undefined;
+};
+import MutableRouter from "../lib/MutableRouter.js";

package/dist/routes/static.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const fs_1 = require("fs");
+const url_1 = require("url");
+const path_1 = require("path");
+const module_1 = require("module");
+const dirname_cjs_1 = __importDefault(require("./dirname.cjs"));
+const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
+const oneDay = 86400000;
+/**
+ * @typedef {object} StaticOptions Options to configure static router
+ * @property {string} [mountUrl=/] URL prefix for govuk-frontend static assets (optional, default /)
+ * @property {number} [maxAge=3600000] Cache TTL for all assets (optional, default 1 hour)
+ */
+/**
+ * Create a router for serving CASA's static assets.
+ *
+ * @param {StaticOptions} options Options
+ * @returns {MutableRouter} ExpressJS Router instance
+ */
+function staticRouter({ mountUrl = '/', maxAge = 3600000, }) {
+    const staticRouter = new MutableRouter_js_1.default();
+    const notFoundHandler = (req, res, next) => {
+        // Fall through to a general purpose error handler
+        next(new Error('404'));
+    };
+    const setHeaders = (req, res, next) => {
+        var _a;
+        res.set('cache-control', 'public');
+        res.set('pragma', 'cache');
+        res.set('expires', new Date(Date.now() + oneDay).toUTCString());
+        const { pathname } = new url_1.URL((_a = req === null || req === void 0 ? void 0 : req.originalUrl) !== null && _a !== void 0 ? _a : '', 'http://placeholder.test/');
+        if (pathname.substr(-4) === '.css') {
+            // Just needed for our in-memory CSS assets
+            res.set('content-type', 'text/css');
+        }
+        next();
+    };
+    const staticConfig = {
+        etag: true,
+        lastModified: false,
+        maxAge,
+        setHeaders: (res) => {
+            setHeaders(null, res, () => { });
+        },
+    };
+    // The CASA CSS source contains the placeholder `~~~CASA_MOUNT_URL~~~` which
+    // must be replaced with the dynamic `mountUrl` to ensure govuk-frontend
+    // assets are served from the correct location.
+    const casaCss = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default, '../../dist/assets/css/casa.css'), { encoding: 'utf8' }).replace(/~~~CASA_MOUNT_URL~~~/g, mountUrl);
+    const casaCssIe8 = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default, '../../dist/assets/css/casa-ie8.css'), { encoding: 'utf8' }).replace(/~~~CASA_MOUNT_URL~~~/g, mountUrl);
+    // The static middleware will only server GET/HEAD requests, so we can mount
+    // the middleware using `use()` rather than resorting to `get()`
+    const govukFrontendDirectory = (0, path_1.resolve)((0, module_1.createRequire)(dirname_cjs_1.default).resolve('govuk-frontend'), '../../');
+    staticRouter.use('/govuk/assets/js/all.js', (0, express_1.static)(`${govukFrontendDirectory}/govuk/all.js`, staticConfig));
+    staticRouter.use('/govuk/assets', (0, express_1.static)(`${govukFrontendDirectory}/govuk/assets`, staticConfig));
+    staticRouter.use('/govuk/assets', notFoundHandler);
+    staticRouter.use('/casa/assets/css/casa.css', setHeaders, (req, res) => res.send(casaCss));
+    staticRouter.use('/casa/assets/css/casa-ie8.css', setHeaders, (req, res) => res.send(casaCssIe8));
+    staticRouter.use('/casa/assets', notFoundHandler);
+    return staticRouter;
+}
+exports.default = staticRouter;

package/package.json

@@ -1,110 +1,69 @@
 {
   "name": "@dwp/govuk-casa",
-  "version": "7.0.6",
-  "description": "Framework for creating basic GOVUK Collect-And-Submit-Applications",
-  "main": "casa.js",
+  "version": "8.0.0-alpha1",
+  "description": "A framework for building GOVUK Collect-And-Submit-Applications",
+  "main": "dist/casa.js",
+  "module": "dist/mjs/casa.js",
+  "exports": {
+    "import": "./dist/mjs/esm-wrapper.js",
+    "require": "./dist/casa.js"
+  },
+  "typings": "dist/casa.d.ts",
   "files": [
-    "/definitions/**/*",
-    "/dist/**/*",
-    "/lib/**/*",
-    "/locales/**/*",
-    "/middleware/**/*",
-    "/test/utils/**/*",
-    "/src/scss/*",
-    "/src/browserconfig.xml",
-    "/views/**/*",
-    "/index.js",
-    "/casa.js",
-    "/**/*.d.ts",
-    "!/**/*/.DS_Store",
-    "!/**/*/.gitkeep",
-    "!/examples/**/*",
-    "!/test/unit/testdata/**/*"
+    "dist/**/*",
+    "locales/**/*",
+    "views/**/*"
   ],
-  "engines": {
-    "node": ">=14.0.0 <17.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:dwp/govuk-casa.git"
+  "scripts": {
+    "test": "mocha './tests/**/*.test.js'",
+    "test:e2e": "spiderplan --worker-init ./tests/e2e/worker-init.js --language en ./tests/e2e/personas/**/*.yaml",
+    "build": "npm run build:prepare && npm run build:sources && npm run build:css-assets",
+    "build:prepare": "rm -rf dist/* && mkdir -p dist/assets/js/ && mkdir -p dist/assets/css/",
+    "build:sources": "tsc -p tsconfig-cjs.json && ./scripts/fixup.sh",
+    "build:css-assets": "node scripts/compile-sass.js",
+    "prepare": "npm run build"
   },
+  "keywords": [],
+  "author": "DWP Digital",
+  "license": "ISC",
+  "type": "module",
   "dependencies": {
-    "body-parser": "1.19.0",
-    "colors": "1.4.0",
+    "cookie-parser": "1.4.5",
     "csurf": "1.11.0",
     "debug": "4.3.2",
-    "dot-object": "2.1.4",
-    "fast-copy": "2.1.1",
-    "fs-extra": "10.0.0",
-    "govuk-frontend": "3.13.1",
-    "govuk_template_jinja": "0.26.0",
+    "deepmerge": "4.2.2",
+    "express": "4.17.1",
+    "express-session": "1.17.2",
+    "govuk-frontend": "3.14.0",
     "graphlib": "2.1.8",
-    "klaw-sync": "6.0.0",
-    "lodash.merge": "4.6.2",
+    "helmet": "4.6.0",
+    "i18next": "21.2.4",
+    "i18next-http-middleware": "3.1.4",
+    "js-yaml": "4.1.0",
+    "lodash": "4.17.21",
     "luxon": "2.0.2",
     "nunjucks": "3.2.3",
-    "serve-favicon": "2.5.0",
-    "uid-safe": "2.1.5",
     "uuid": "8.3.2",
-    "validator": "13.6.0"
+    "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "13.2.0",
-    "@commitlint/config-conventional": "13.2.0",
-    "@commitlint/travis-cli": "13.2.0",
+    "@babel/core": "7.15.8",
+    "@babel/eslint-parser": "7.15.8",
+    "@babel/preset-env": "7.15.8",
+    "@dwp/casa-spiderplan": "1.0.0",
     "@dwp/commitlint-config-base": "1.2.0",
     "@dwp/eslint-config-base": "5.0.1",
-    "@stryker-mutator/core": "5.4.0",
-    "@stryker-mutator/html-reporter": "3.1.0",
-    "@stryker-mutator/javascript-mutator": "4.0.0",
-    "@stryker-mutator/mocha-framework": "4.0.0",
-    "@stryker-mutator/mocha-runner": "5.4.0",
-    "autocannon": "7.4.0",
+    "@types/express": "4.17.13",
+    "@types/node": "16.10.2",
+    "babel-eslint": "10.1.0",
     "chai": "4.3.4",
-    "chai-as-promised": "7.1.1",
-    "chai-http": "4.3.0",
-    "cheerio": "1.0.0-rc.10",
-    "conventional-changelog-cli": "2.1.1",
+    "commitlint": "13.2.0",
     "eslint": "7.32.0",
     "eslint-plugin-no-unsafe-regex": "1.0.0",
     "eslint-plugin-sonarjs": "0.10.0",
-    "express": "4.17.1",
-    "express-session": "1.17.2",
     "husky": "7.0.2",
-    "jsdom": "17.0.0",
-    "minimatch": "3.0.4",
     "mocha": "9.1.2",
-    "nyc": "15.1.0",
-    "proxyquire": "2.1.3",
     "sass": "1.42.1",
-    "sinon": "11.1.2",
-    "sinon-chai": "3.7.0",
-    "supertest": "6.1.6",
-    "uglify-js": "3.14.2",
-    "yargs": "17.2.1"
-  },
-  "peerDependencies": {
-    "express": "4.x",
-    "express-session": "1.x"
-  },
-  "scripts": {
-    "pipeline": "npm test && npm run compliance && npm run quality && npm run security:vulnerable-packages && (npm outdated || true)",
-    "compliance": "npm run compliance:lint",
-    "compliance:lint": "eslint .",
-    "test": "npm run test:unit --silent && npm run test:integration --silent",
-    "test:unit": "mocha -R spec \"./test/unit/**/*.test.js\"",
-    "test:integration": "mocha -R spec \"./test/integration/**/*.test.js\"",
-    "test:performance": "node ./test/performance/plan.test.js",
-    "quality": "npm run quality:coverage",
-    "quality:coverage": "nyc npm test",
-    "quality:mutation": "stryker run",
-    "security": "npm run security:vulnerable-packages",
-    "security:vulnerable-packages": "npm audit --production --registry=https://registry.npmjs.org --json | node -e 'a=JSON.parse(fs.readFileSync(\"/dev/stdin\",\"utf-8\")).metadata.vulnerabilities;process.exit(a.high+a.critical);'",
-    "package:changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "compile-static-assets": "node ./scripts/compile-sass.js && node ./scripts/compile-js.js",
-    "prepare": "npm run compile-static-assets --silent; husky install",
-    "upgrade-deps": "OD=$(npm outdated --long --parseable); echo \"$OD\" | grep ':devDependencies:' | awk -F: '{ print $4 }' | xargs npm i -DE; echo \"$OD\" | grep ':dependencies:' | awk -F: '{ print $4 }' | xargs npm i -E"
-  },
-  "author": "DWP <open-source@engineering.digital.dwp.gov.uk>",
-  "license": "ISC"
+    "typescript": "4.4.3"
+  }
 }

package/views/casa/components/checkboxes/template.njk

@@ -16,6 +16,7 @@
   id: params.id if params.id else 'f-' + params.name + '-wrapper' | safe
 }) %}
 
+
 {# Add checked flag to chosen inputs #}
 {% set mergedItems = [] %}
 {% for item in params.items %}
@@ -30,6 +31,7 @@
   {% set mergedItems = (mergedItems.push(item), mergedItems) %}
 {% endfor %}
 
+
 {# Merge parameters #}
 {% set mergedParams = mergeObjects(params, {
   name: fieldName,
@@ -43,11 +45,12 @@
 
 {# Ensure that the first item has the id matching `f-<name>` in order for error summary linkage to work #}
 {% if not mergedParams.items[0].id %}
-  {% set mergedParams = mergeObjectsDeep(mergedParams, {
+  {% set mergedParams = mergeObjects(mergedParams, {
     items: [{
       id: 'f-' + params.name
     }]
   }) %}
 {% endif %}
 
+
 {{ govukCheckboxes(mergedParams) }}