@dwp/govuk-casa 8.0.0 → 8.0.1

package/CHANGELOG.md

@@ -2,7 +2,9 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [8.0.0](https://gitlab.com/dwp/engineering/capture-and-submit-application/govuk-casa/compare/7.0.8...8.0.0) (2021-12-21)
+### [8.0.1](https://github.com/dwp/govuk-casa/compare/8.0.0...8.0.1) (2022-01-12)
+
+## [8.0.0](https://github.com/dwp/govuk-casa/compare/7.0.8...8.0.0) (2021-12-21)
 
 
 ### ⚠ BREAKING CHANGES
@@ -10,8 +12,6 @@ All notable changes to this project will be documented in this file. See [standa
 * The framework has been rewritten. Refer to
 docs/migration-guides/MIGRATION_7.x-8.x.md for more details.
 
-Signed-off-by: james.gauld <james.gauld@engineering.digital.dwp.gov.uk>
-
 * rewrite framework ([48c44ec](https://gitlab.com/dwp/engineering/capture-and-submit-application/govuk-casa/commit/48c44ec78d9a93eb736e74f7b23b62b0898a1e1c))
 
 ### [7.0.8](https://github.com/dwp/govuk-casa/compare/7.0.7...7.0.8) (2021-12-10)

package/dist/lib/field.d.ts

@@ -10,7 +10,7 @@ export class PageField {
      * @throws {Error} When run on a complex field
      */
     getValue(obj?: object): any;
-    putValue(obj: any, value: any): PageField;
+    putValue(obj?: any, value?: undefined): PageField;
     get name(): string;
     get meta(): object;
     /**
@@ -46,7 +46,7 @@ export class PageField {
      * @param {ValidateContext} context Contextual information
      * @returns {ValidationError[]} Errors, or an empty array if all valid
      */
-    runValidators(value: any, context: any): ValidationError[];
+    runValidators(value: any, context?: any): ValidationError[];
     applyProcessors(value: any): any;
     /**
      * Apply all conditions to get the resulting boolean

package/dist/lib/field.js

@@ -107,7 +107,7 @@ class PageField {
         }
         throw new Error('Not yet supporting complex field types');
     }
-    putValue(obj = Object.create(null), value) {
+    putValue(obj = Object.create(null), value = undefined) {
         if (!__classPrivateFieldGet(this, _PageField_meta, "f").complex) {
             /* eslint-disable-next-line no-param-reassign */
             obj[__classPrivateFieldGet(this, _PageField_name, "f")] = value;
@@ -174,11 +174,18 @@ class PageField {
      * @param {ValidateContext} context Contextual information
      * @returns {ValidationError[]} Errors, or an empty array if all valid
      */
-    runValidators(value, context) {
+    runValidators(value, context = Object.create(null)) {
+        var _a;
         // Skip validation if the field is empty and optional
         if (__classPrivateFieldGet(this, _PageField_meta, "f").optional && (0, utils_js_1.isEmpty)(value)) {
             return [];
         }
+        // Skip validation if conditions are not met
+        // We duplicate value in context.fieldValue for historical reasons
+        context.fieldValue = (_a = context.fieldValue) !== null && _a !== void 0 ? _a : value;
+        if (!this.testConditions(context)) {
+            return [];
+        }
         let errors = [];
         for (let i = 0, l = __classPrivateFieldGet(this, _PageField_validators, "f").length; i < l; i++) {
             // ESLint disabled as `i` is an integer

package/dist/lib/validators/postalAddressObject.js

@@ -77,7 +77,7 @@ class PostalAddressObject extends ValidatorFactory_js_1.default {
             const reAddrLine1 = /^\d+|[^\s]+[a-z0-9\-,.&#()/\\:;'" ]+$/i;
             // UK Postcode regex taken from the dwp java pc checker
             // https://github.com/dwp/postcode-format-validation
-            const rePostcode = new RegExp(/^(?![QVX])[A-Z]((?![IJZ])[A-Z][0-9](([0-9]?)|([ABEHMNPRVWXY]?))|([0-9]([0-9]?|[ABCDEFGHJKPSTUW]?))) ?[0-9]((?![CIKMOV])[A-Z]){2}$|^(BFPO)[ ]?[0-9]{1,4}$/i, 'i');
+            const rePostcode = /^(?![QVX])[A-Z]((?![IJZ])[A-Z][0-9](([0-9]?)|([ABEHMNPRVWXY]?))|([0-9]([0-9]?|[ABCDEFGHJKPSTUW]?))) ?[0-9]((?![CIKMOV])[A-Z]){2}$|^(BFPO)[ ]?[0-9]{1,4}$/i;
             // [required, regex, strlenmax, error message]
             const attributes = {
                 address1: [reqF.address1, reAddrLine1, cfg.strlenmax, cfg.errorMsgAddress1],

package/dist/middleware/validate-fields.js

@@ -33,12 +33,10 @@ exports.default = ({ waypoint, fields = [], mountUrl, plan, }) => [
                 journeyContext: req.casa.journeyContext,
             };
             /* eslint-enable security/detect-object-injection */
-            if (field.testConditions(context)) {
-                errors = [
-                    ...errors,
-                    ...field.runValidators(fieldValue, context),
-                ];
-            }
+            errors = [
+                ...errors,
+                ...field.runValidators(fieldValue, context),
+            ];
         }
         // Validation passed with no errors
         if (!errors.length) {

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@dwp/govuk-casa",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "A framework for building GOVUK Collect-And-Submit-Applications",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:dwp/govuk-casa.git"
+  },
   "main": "dist/casa.js",
   "module": "dist/mjs/casa.js",
   "exports": {
@@ -45,44 +49,44 @@
     "express-session": "1.17.2",
     "govuk-frontend": "4.0.0",
     "graphlib": "2.1.8",
-    "helmet": "4.6.0",
-    "i18next": "21.6.3",
-    "i18next-http-middleware": "3.1.4",
+    "helmet": "5.0.1",
+    "i18next": "21.6.6",
+    "i18next-http-middleware": "3.1.5",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
-    "luxon": "2.2.0",
+    "luxon": "2.3.0",
     "nunjucks": "3.2.3",
     "uuid": "8.3.2",
     "validator": "^13.7.0"
   },
   "devDependencies": {
-    "@babel/core": "7.16.5",
+    "@babel/core": "7.16.7",
     "@babel/eslint-parser": "7.16.5",
-    "@babel/preset-env": "7.16.5",
-    "@commitlint/config-conventional": "15.0.0",
+    "@babel/preset-env": "7.16.8",
+    "@commitlint/config-conventional": "16.0.0",
     "@dwp/casa-spiderplan": "2.0.0",
     "@dwp/casa-spiderplan-a11y-plugin": "0.1.3",
     "@dwp/casa-spiderplan-zap-plugin": "0.1.1",
-    "@dwp/eslint-config-base": "5.0.1",
+    "@dwp/eslint-config-base": "6.0.0",
     "@types/express": "4.17.13",
-    "@types/node": "17.0.1",
-    "@types/nunjucks": "3.2.0",
+    "@types/node": "17.0.8",
+    "@types/nunjucks": "3.2.1",
     "babel-eslint": "10.1.0",
-    "c8": "7.10.0",
+    "c8": "7.11.0",
     "chai": "4.3.4",
-    "commitlint": "15.0.0",
-    "eslint": "7.32.0",
+    "commitlint": "16.0.2",
+    "eslint": "8.6.0",
     "eslint-plugin-no-unsafe-regex": "1.0.0",
     "eslint-plugin-security": "1.4.0",
     "eslint-plugin-sonarjs": "0.11.0",
-    "fast-check": "2.20.0",
+    "fast-check": "2.21.0",
     "husky": "7.0.4",
     "mocha": "9.1.3",
-    "sass": "1.45.0",
+    "sass": "1.47.0",
     "sinon": "12.0.1",
     "sinon-chai": "3.7.0",
     "standard-version": "9.3.2",
-    "supertest": "6.1.6",
+    "supertest": "6.2.1",
     "typescript": "4.5.4"
   }
 }