@dwp/govuk-casa 8.3.0 → 8.5.1

package/dist/lib/field.js

@@ -18,7 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PageField = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const utils_js_1 = require("./utils.js");
+const logger_js_1 = __importDefault(require("./logger.js"));
 const { isFunction } = lodash_1.default;
+const log = (0, logger_js_1.default)('lib:field');
 /**
  * @access private
  * @typedef {import('./index').JourneyContext} JourneyContext
@@ -100,6 +102,27 @@ class PageField {
         // Apply name
         this.rename(name);
     }
+    /**
+     * Clone this field.
+     *
+     * @returns {PageField} Cloned field
+     */
+    clone() {
+        const clone = new PageField(__classPrivateFieldGet(this, _PageField_name, "f"), {
+            optional: __classPrivateFieldGet(this, _PageField_meta, "f").optional,
+            persist: __classPrivateFieldGet(this, _PageField_meta, "f").persist,
+        });
+        if (this.validators()) {
+            clone.validators(this.validators());
+        }
+        if (this.conditions()) {
+            clone.conditions(this.conditions());
+        }
+        if (this.processors()) {
+            clone.processors(this.processors());
+        }
+        return clone;
+    }
     /**
      * Extract this field's value from the given object.
      *
@@ -243,7 +266,12 @@ class PageField {
             // ESLint disabled as `i` is an integer
             /* eslint-disable security/detect-object-injection */
             // TODO: Replace `value` with `context.fieldValue` here
-            const fieldErrors = __classPrivateFieldGet(this, _PageField_validators, "f")[i].validate(value, context).map((e) => e.withContext(Object.assign(Object.assign({}, context), { validator: __classPrivateFieldGet(this, _PageField_validators, "f")[i].name })));
+            let fieldErrors = __classPrivateFieldGet(this, _PageField_validators, "f")[i].validate(value, context);
+            if (!Array.isArray(fieldErrors)) {
+                // Friendly message for developer
+                throw new TypeError(`The validator at index ${i} (name: ${__classPrivateFieldGet(this, _PageField_validators, "f")[i].name || 'unknown'}) for field '${__classPrivateFieldGet(this, _PageField_name, "f")}' did not return an array`);
+            }
+            fieldErrors = fieldErrors.map((e) => e.withContext(Object.assign(Object.assign({}, context), { validator: __classPrivateFieldGet(this, _PageField_validators, "f")[i].name })));
             /* eslint-enable security/detect-object-injection */
             errors = [
                 ...errors,

package/dist/lib/nunjucks-filters.d.ts

@@ -17,11 +17,23 @@ export function includes(source?: any[], search?: any): boolean;
  *   object - {dd:'', mm:'', yyyy:''}
  *
  * @memberof NunjucksFilters
- * @param  {object} date Date (see supported formats above)
- * @param  {object} config Holds locale
+ * @param  {object} date Date
+ * @param  {string} date.dd Day
+ * @param  {string} date.mm Month
+ * @param  {string} date.yyyy Year
+ * @param  {object} [config] Options
+ * @param  {string} [config.locale] Locale (default 'en')
+ * @param  {string} [config.format] Format (default 'd MMMM yyyy')
  * @returns {string} Formatted date
  */
-export function formatDateObject(date: object, config?: object): string;
+export function formatDateObject(date: {
+    dd: string;
+    mm: string;
+    yyyy: string;
+}, config?: {
+    locale?: string | undefined;
+    format?: string | undefined;
+} | undefined): string;
 /**
  * Attribute values will be HTML/attribute escaped.
  *

package/dist/lib/nunjucks-filters.js

@@ -54,12 +54,17 @@ exports.includes = includes;
  *   object - {dd:'', mm:'', yyyy:''}
  *
  * @memberof NunjucksFilters
- * @param  {object} date Date (see supported formats above)
- * @param  {object} config Holds locale
+ * @param  {object} date Date
+ * @param  {string} date.dd Day
+ * @param  {string} date.mm Month
+ * @param  {string} date.yyyy Year
+ * @param  {object} [config] Options
+ * @param  {string} [config.locale] Locale (default 'en')
+ * @param  {string} [config.format] Format (default 'd MMMM yyyy')
  * @returns {string} Formatted date
  */
 function formatDateObject(date, config = {}) {
-    const { locale = 'en' } = config;
+    const { locale = 'en', format = 'd MMMM yyyy' } = config;
     if (Object.prototype.toString.call(date) === '[object Object]'
         && 'yyyy' in date
         && 'mm' in date
@@ -68,7 +73,7 @@ function formatDateObject(date, config = {}) {
             year: Math.max(0, parseInt(date.yyyy, 10)),
             month: Math.max(0, parseInt(date.mm, 10)),
             day: Math.max(1, parseInt(date.dd, 10)),
-        }).setLocale(locale).toFormat('d MMMM yyyy');
+        }).setLocale(locale).toFormat(format);
     }
     return 'INVALID DATE OBJECT';
 }

package/dist/lib/waypoint-url.d.ts

@@ -1,6 +1,15 @@
 /**
  * Generate a URL pointing at a particular waypoint.
  *
+ * @example
+ * // generates: /path/details?edit&editorigin=%2Fsomewhere%2Felse
+ * waypointUrl({
+ *   mountUrl: '/path/',
+ *   waypoint: 'details',
+ *   edit: true,
+ *   editOrigin: '/somewhere/else'
+ * })
+ *
  * @memberof module:@dwp/govuk-casa
  * @param {object} obj Options
  * @param {string} obj.waypoint Waypoint

package/dist/lib/waypoint-url.js

@@ -17,6 +17,15 @@ const sanitiseWaypoint = (w) => w.replace(/[^/a-z0-9_-]/ig, '').replace(/\/+/g,
 /**
  * Generate a URL pointing at a particular waypoint.
  *
+ * @example
+ * // generates: /path/details?edit&editorigin=%2Fsomewhere%2Felse
+ * waypointUrl({
+ *   mountUrl: '/path/',
+ *   waypoint: 'details',
+ *   edit: true,
+ *   editOrigin: '/somewhere/else'
+ * })
+ *
  * @memberof module:@dwp/govuk-casa
  * @param {object} obj Options
  * @param {string} obj.waypoint Waypoint

package/dist/middleware/post.js

@@ -26,31 +26,31 @@ function postMiddleware() {
             // CSRF token is invalid in some way
             if ((err === null || err === void 0 ? void 0 : err.code) === 'EBADCSRFTOKEN') {
                 log.info('CSRF validation has failed. This may be caused by the user submitting a stale form from a previous session [EBADCSRFTOKEN]');
-                return res.status(403).render(TEMPLATE, { errorCode: 'bad_csrf_token' });
+                return res.status(403).render(TEMPLATE, { errorCode: 'bad_csrf_token', error: err });
             }
             // Body parsing verification check failed
             if ((err === null || err === void 0 ? void 0 : err.type) === 'entity.verify.failed') {
                 log.info('Body parser verification has failed. This has been caused by the user submitting a payload containing invalid data [entity.verify.failed]');
-                return res.status(403).render(TEMPLATE, { errorCode: 'invalid_payload' });
+                return res.status(403).render(TEMPLATE, { errorCode: 'invalid_payload', error: err });
             }
             // Too many parameters submitted
             if ((err === null || err === void 0 ? void 0 : err.type) === 'parameters.too.many') {
                 log.info('The request contains more parameters than is currently allowed [parameters.too.many]');
-                return res.status(413).render(TEMPLATE, { errorCode: 'parameter_limit_exceeded' });
+                return res.status(413).render(TEMPLATE, { errorCode: 'parameter_limit_exceeded', error: err });
             }
             // Overall payload too large
             if ((err === null || err === void 0 ? void 0 : err.type) === 'entity.too.large') {
                 log.info(`The request payload is too large. Received ${err.length}b with a maximum of ${err.limit}b [parameters.too.many]`);
-                return res.status(413).render(TEMPLATE, { errorCode: 'payload_size_exceeded' });
+                return res.status(413).render(TEMPLATE, { errorCode: 'payload_size_exceeded', error: err });
             }
             // Unaccept request method
             if ((err === null || err === void 0 ? void 0 : err.code) === 'unaccepted_request_method') {
                 log.info(err.message);
-                return res.status(400).render(TEMPLATE, { errorCode: 'unaccepted_request_method' });
+                return res.status(400).render(TEMPLATE, { errorCode: 'unaccepted_request_method', error: err });
             }
             // Unknown error
             log.error(`Unknown error: ${err.message}; stacktrace: ${err.stack}`);
-            return res.status(200).render(TEMPLATE);
+            return res.status(200).render(TEMPLATE, { error: err });
         },
     ];
 }

package/dist/middleware/pre.js

@@ -7,7 +7,8 @@ const crypto_1 = require("crypto");
 const helmet_1 = __importDefault(require("helmet"));
 const GA_DOMAIN = '*.google-analytics.com';
 const GA_ANALYTICS_DOMAIN = '*.analytics.google.com';
-const GTM_DOMAIN = 'www.googletagmanager.com';
+const GTM_DOMAIN = '*.googletagmanager.com';
+const GTM_PREVIEW_DOMAIN = 'https://tagmanager.google.com';
 /**
  * @access private
  * @typedef {import('../casa').HelmetConfigurator} HelmetConfigurator
@@ -55,14 +56,14 @@ exports.default = ({ helmetConfigurator = (config) => (config), } = {}) => [
             useDefaults: true,
             directives: {
                 'default-src': ["'none'"],
-                'script-src': ["'self'", GA_DOMAIN, GTM_DOMAIN, (req, res) => `'nonce-${res.locals.cspNonce}'`],
-                'img-src': ["'self'", GA_DOMAIN, GA_ANALYTICS_DOMAIN],
-                'connect-src': ["'self'", GA_DOMAIN, GA_ANALYTICS_DOMAIN],
+                'script-src': ["'self'", GA_DOMAIN, GTM_DOMAIN, GTM_PREVIEW_DOMAIN, (req, res) => `'nonce-${res.locals.cspNonce}'`],
+                'img-src': ["'self'", GA_DOMAIN, GA_ANALYTICS_DOMAIN, GTM_DOMAIN, 'https://ssl.gstatic.com', 'https://www.gstatic.com'],
+                'connect-src': ["'self'", GA_DOMAIN, GA_ANALYTICS_DOMAIN, GTM_DOMAIN],
                 'frame-src': ["'self'", GTM_DOMAIN],
                 'frame-ancestors': ["'self'"],
                 'form-action': ["'self'"],
-                'style-src': ["'self'", (req, res) => `'nonce-${res.locals.cspNonce}'`],
-                'font-src': ["'self'"],
+                'style-src': ["'self'", 'https://fonts.googleapis.com', GTM_PREVIEW_DOMAIN, (req, res) => `'nonce-${res.locals.cspNonce}'`],
+                'font-src': ["'self'", 'data:', 'https://fonts.gstatic.com'],
             },
         },
         // // Require referrer to aid navigation

package/dist/middleware/steer-journey.js

@@ -57,7 +57,13 @@ exports.default = ({ waypoint, plan, }) => [
             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;
+        res.locals.casa.journeyPreviousUrl = prevRoute.target ? (0, waypoint_url_js_1.default)({
+            mountUrl,
+            waypoint: prevRoute.target,
+            routeName: 'prev',
+            edit: req.casa.editMode,
+            editOrigin: req.casa.editOrigin,
+        }) : undefined;
         return next();
     },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwp/govuk-casa",
-  "version": "8.3.0",
+  "version": "8.5.1",
   "description": "A framework for building GOVUK Collect-And-Submit-Applications",
   "repository": {
     "type": "git",
@@ -46,54 +46,54 @@
     "csurf": "1.11.0",
     "debug": "4.3.4",
     "deepmerge": "4.2.2",
-    "express": "4.18.1",
+    "express": "4.18.2",
     "express-session": "1.17.3",
-    "govuk-frontend": "4.2.0",
+    "govuk-frontend": "4.3.1",
     "graphlib": "2.1.8",
-    "helmet": "5.1.0",
-    "i18next": "21.8.11",
+    "helmet": "5.1.1",
+    "i18next": "21.10.0",
     "i18next-http-middleware": "3.2.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
-    "luxon": "2.4.0",
+    "luxon": "2.5.0",
     "nunjucks": "3.2.3",
     "path-to-regexp": "6.2.1",
     "uuid": "8.3.2",
     "validator": "13.7.0"
   },
   "devDependencies": {
-    "@babel/core": "7.18.6",
-    "@babel/eslint-parser": "7.18.2",
-    "@babel/preset-env": "7.18.6",
-    "@ckeditor/jsdoc-plugins": "30.3.1",
-    "@commitlint/config-conventional": "17.0.3",
-    "@dwp/casa-spiderplan": "2.4.0",
+    "@babel/core": "7.19.3",
+    "@babel/eslint-parser": "7.19.1",
+    "@babel/preset-env": "7.19.4",
+    "@ckeditor/jsdoc-plugins": "30.5.0",
+    "@commitlint/config-conventional": "17.1.0",
+    "@dwp/casa-spiderplan": "2.4.1",
     "@dwp/casa-spiderplan-a11y-plugin": "0.1.4",
     "@dwp/casa-spiderplan-zap-plugin": "0.1.1",
     "@dwp/eslint-config-base": "6.0.0",
-    "@types/express": "4.17.13",
+    "@types/express": "4.17.14",
     "@types/node": "18.0.0",
     "@types/nunjucks": "3.2.1",
     "babel-eslint": "10.1.0",
-    "c8": "7.11.3",
+    "c8": "7.12.0",
     "chai": "4.3.6",
     "cheerio": "1.0.0-rc.12",
-    "commitlint": "17.0.3",
+    "commitlint": "17.1.2",
     "docdash": "1.2.0",
-    "eslint": "8.18.0",
+    "eslint": "8.25.0",
     "eslint-plugin-no-unsafe-regex": "1.0.0",
     "eslint-plugin-security": "1.5.0",
-    "eslint-plugin-sonarjs": "0.13.0",
-    "fast-check": "3.0.1",
+    "eslint-plugin-sonarjs": "0.16.0",
+    "fast-check": "3.2.0",
     "husky": "8.0.1",
-    "jsdoc": "3.6.10",
+    "jsdoc": "3.6.11",
     "jsdoc-tsimport-plugin": "1.0.5",
     "mocha": "10.0.0",
-    "sass": "1.53.0",
-    "sinon": "14.0.0",
+    "sass": "1.55.0",
+    "sinon": "14.0.1",
     "sinon-chai": "3.7.0",
     "standard-version": "9.5.0",
-    "supertest": "6.2.3",
-    "typescript": "4.7.4"
+    "supertest": "6.3.0",
+    "typescript": "4.8.4"
   }
 }