@ukhomeoffice/cop-react-form-renderer 5.0.0-alpha → 5.0.0

package/dist/utils/Validate/validateComponent.test.js

@@ -0,0 +1,365 @@
+"use strict";
+
+var _models = require("../../models");
+var _validateComponent = _interopRequireDefault(require("./validateComponent"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+describe('utils.Validate.Component', function () {
+  var setup = function setup(id, type, label, required, additionalValidation) {
+    return {
+      id: id,
+      fieldId: id,
+      type: type,
+      label: label,
+      required: required,
+      additionalValidation: additionalValidation
+    };
+  };
+  it('should return no error when the component is null', function () {
+    expect((0, _validateComponent.default)(null, {})).toBeUndefined();
+  });
+  describe('when there is no form data', function () {
+    it('should return no error when the component is not required and not an email type', function () {
+      var ID = 'field';
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.TEXT, LABEL, false);
+      expect((0, _validateComponent.default)(COMPONENT, null)).toBeUndefined();
+    });
+    it('should return a required error when the component is required and not an email type', function () {
+      var ID = 'field';
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.TEXT, LABEL, true);
+      expect((0, _validateComponent.default)(COMPONENT, null)).toEqual({
+        id: ID,
+        error: "".concat(LABEL, " is required")
+      });
+    });
+    it('should return a required error when the component is required and of type email', function () {
+      var ID = 'field';
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.EMAIL, LABEL, true);
+      expect((0, _validateComponent.default)(COMPONENT, null)).toEqual({
+        id: ID,
+        error: "".concat(LABEL, " is required")
+      });
+    });
+    it('should return no error when the component is of type email but not required', function () {
+      var ID = 'field';
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.EMAIL, LABEL, false);
+      expect((0, _validateComponent.default)(COMPONENT, null)).toBeUndefined();
+    });
+  });
+  describe('when the value is fully valid', function () {
+    var ID = 'field';
+    var DATA = _defineProperty({}, ID, 'alpha.bravo@digital.homeoffice.gov.uk');
+    it('should return no error when the component is not required and not an email type', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.TEXT, LABEL, false);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toBeUndefined();
+    });
+    it('should return no error when the component is required and not an email type', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.TEXT, LABEL, true);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toBeUndefined();
+    });
+    it('should return no error when the component is required and of type email', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.EMAIL, LABEL, true);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toBeUndefined();
+    });
+    it('should return no error when the component is of type email but not required', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.EMAIL, LABEL, false);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toBeUndefined();
+    });
+  });
+  describe('when the value is an invalid email', function () {
+    var ID = 'field';
+    var DATA = _defineProperty({}, ID, 'alpha.bravo@hotmail.com');
+    it('should return no error when the component is not required and not an email type', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.TEXT, LABEL, false);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toBeUndefined();
+    });
+    it('should return no error when the component is required and not an email type', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.TEXT, LABEL, true);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toBeUndefined();
+    });
+    it('should return no error when the component is required and of type email', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.EMAIL, LABEL, true);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toEqual({
+        id: ID,
+        error: "Enter ".concat(LABEL.toLowerCase(), " in the correct format, like jane.doe@homeoffice.gov.uk")
+      });
+    });
+    it('should return no error when the component is of type email but not required', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.EMAIL, LABEL, false);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toEqual({
+        id: ID,
+        error: "Enter ".concat(LABEL.toLowerCase(), " in the correct format, like jane.doe@homeoffice.gov.uk")
+      });
+    });
+  });
+  describe('when the component is a Date Input', function () {
+    var ID = 'field';
+    it('should always reject invalid dates', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.DATE, LABEL, false);
+      var DATA = _defineProperty({}, ID, '25-45-2033');
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toEqual({
+        error: 'Month must be between 1 and 12',
+        id: ID,
+        properties: {
+          month: true
+        }
+      });
+    });
+    it('should apply optional validators when specified', function () {
+      var LABEL = 'Field';
+      var DATA = _defineProperty({}, ID, '25-3-3033');
+      var ADDITIONAL_VALIDATION = [{
+        function: 'mustBeBefore',
+        value: 3,
+        unit: 'day',
+        message: 'Date must be less than 3 days in the future'
+      }];
+      var COMPONENT = setup(ID, _models.ComponentTypes.DATE, LABEL, false, ADDITIONAL_VALIDATION);
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toEqual({
+        error: 'Date must be less than 3 days in the future',
+        id: ID,
+        properties: {
+          day: true,
+          month: true,
+          year: true
+        }
+      });
+    });
+  });
+  describe('when the component is a Time Input', function () {
+    var ID = 'field';
+    it('should always reject invalid time', function () {
+      var LABEL = 'Field';
+      var COMPONENT = setup(ID, _models.ComponentTypes.TIME, LABEL, false);
+      var DATA = _defineProperty({}, ID, '25:45');
+      expect((0, _validateComponent.default)(COMPONENT, DATA)).toEqual({
+        error: 'Hour must be between 0 and 23',
+        id: ID,
+        properties: {
+          hour: true
+        }
+      });
+    });
+  });
+  describe('when the component is a container', function () {
+    it('should return an empty array when the container has only valid components', function () {
+      var EMAIL_ID = 'email';
+      var EMAIL_LABEL = 'Email';
+      var EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
+      var ID = 'container';
+      var LABEL = 'field';
+      var CONTAINER = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false);
+      CONTAINER.components = [EMAIL];
+      var DATA = _defineProperty({}, ID, _defineProperty({}, EMAIL_ID, 'alpha.bravo@digital.homeoffice.gov.uk'));
+      expect((0, _validateComponent.default)(CONTAINER, DATA)).toEqual([]);
+    });
+  });
+  describe('when the component is a collection', function () {
+    it('should return an empty array when the collection has only valid items', function () {
+      var EMAIL_ID = 'email';
+      var EMAIL_LABEL = 'Email';
+      var EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
+      var ID = 'collection';
+      var LABEL = 'field';
+      var COLLECTION = setup(ID, _models.ComponentTypes.COLLECTION, LABEL, false);
+      COLLECTION.item = [EMAIL];
+      var DATA = _defineProperty({}, ID, [_defineProperty({}, EMAIL_ID, 'alpha.bravo@homeoffice.gov.uk'), _defineProperty({}, EMAIL_ID, 'charlie.delta@homeoffice.gov.uk')]);
+      expect((0, _validateComponent.default)(COLLECTION, DATA)).toEqual([]);
+    });
+  });
+  describe('when the component has a nested component', function () {
+    it('should return no error when the radio component contains nested components without errors', function () {
+      var NESTED_ID = 'nestedId';
+      var NESTED_VALUE = 'nestedValue';
+      var FORMDATA = _defineProperty({}, NESTED_ID, NESTED_VALUE);
+      var COMPONENT = {
+        type: 'radios',
+        id: 'a',
+        data: {
+          options: [{
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID,
+              id: NESTED_ID,
+              required: true
+            }]
+          }]
+        }
+      };
+      expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toBeUndefined();
+    });
+    it('should return an error when the radio component contains nested components with errors', function () {
+      var NESTED_ID = 'nestedId';
+      var FORMDATA = {};
+      var COMPONENT = {
+        type: 'radios',
+        id: 'a',
+        data: {
+          options: [{
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID,
+              id: NESTED_ID,
+              required: true
+            }]
+          }]
+        }
+      };
+      expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toEqual([{
+        id: "nestedId",
+        error: "Field is required"
+      }]);
+    });
+    it('should return no error when a non selected radio component contains nested components with errors', function () {
+      var NESTED_ID = 'nestedId';
+      var COMPONENT = {
+        type: 'radios',
+        id: 'a',
+        data: {
+          options: [{
+            value: 'optionValue',
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID,
+              id: NESTED_ID,
+              required: true
+            }]
+          }]
+        }
+      };
+      expect((0, _validateComponent.default)(COMPONENT, undefined, {})).toBeUndefined();
+    });
+    it('should return no error when the checkbox component contains nested components without errors', function () {
+      var NESTED_ID = 'nestedId';
+      var NESTED_VALUE = 'nestedValue';
+      var FORMDATA = _defineProperty({}, NESTED_ID, NESTED_VALUE);
+      var COMPONENT = {
+        type: 'checkboxes',
+        id: 'a',
+        data: {
+          options: [{
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID,
+              id: NESTED_ID,
+              required: true
+            }]
+          }]
+        }
+      };
+      expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toBeUndefined();
+    });
+    it('should return an error when the checkbox component contains nested components with errors', function () {
+      var NESTED_ID = 'nestedId';
+      var OPTION_VALUE = 'optionValue';
+      var FORMDATA = {
+        'a': [OPTION_VALUE]
+      };
+      var COMPONENT = {
+        type: 'checkboxes',
+        id: 'a',
+        data: {
+          options: [{
+            value: OPTION_VALUE,
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID,
+              id: NESTED_ID,
+              required: true
+            }]
+          }]
+        }
+      };
+      expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toEqual([{
+        id: NESTED_ID,
+        error: "Field is required"
+      }]);
+    });
+    it('should return no error when a non selected checkbox component contains nested components with errors', function () {
+      var NESTED_ID_NOT_SELECTED = 'nestedIdNotSelected';
+      var NESTED_ID_SELECTED = 'nestedIdSelected';
+      var NESTED_VALUE_SELECTED = 'nestedValueSelected';
+      var FORMDATA = _defineProperty({
+        'a': ['optionValueSelected']
+      }, NESTED_ID_SELECTED, NESTED_VALUE_SELECTED);
+      var COMPONENT = {
+        type: 'checkboxes',
+        id: 'a',
+        data: {
+          options: [{
+            id: 'optionIdNotSelected',
+            value: 'optionValueNotSelected',
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID_NOT_SELECTED,
+              id: NESTED_ID_NOT_SELECTED,
+              required: true
+            }]
+          }, {
+            id: 'optionIdSelected',
+            value: 'optionValueSelected',
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID_SELECTED,
+              id: NESTED_ID_SELECTED,
+              required: true
+            }]
+          }]
+        }
+      };
+      expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toBeUndefined();
+    });
+    it('should return no error when all selected checkbox components contains nested components without errors', function () {
+      var _FORMDATA4;
+      var NESTED_ID_SELECTED_1 = 'nestedIdSelected1';
+      var NESTED_ID_SELECTED_2 = 'nestedIdSelected2';
+      var NESTED_VALUE_SELECTED_1 = 'nestedValueSelected1';
+      var NESTED_VALUE_SELECTED_2 = 'nestedValueSelected2';
+      var FORMDATA = (_FORMDATA4 = {
+        'a': ['optionValueSelected1', 'optionValueSelected2']
+      }, _defineProperty(_FORMDATA4, NESTED_ID_SELECTED_1, NESTED_VALUE_SELECTED_1), _defineProperty(_FORMDATA4, NESTED_ID_SELECTED_2, NESTED_VALUE_SELECTED_2), _FORMDATA4);
+      var COMPONENT = {
+        type: 'checkboxes',
+        id: 'a',
+        data: {
+          options: [{
+            id: 'optionIdSelected1',
+            value: 'optionValueSelected1',
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID_SELECTED_1,
+              id: NESTED_ID_SELECTED_1,
+              required: true
+            }]
+          }, {
+            id: 'optionIdSelected2',
+            value: 'optionValueSelected2',
+            nested: [{
+              type: 'text',
+              fieldId: NESTED_ID_SELECTED_2,
+              id: NESTED_ID_SELECTED_2,
+              required: true
+            }]
+          }]
+        }
+      };
+      expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toBeUndefined();
+    });
+  });
+});

package/dist/utils/Validate/validateContainer.js

@@ -7,9 +7,12 @@ exports.default = void 0;
 var _validateComponent = _interopRequireDefault(require("./validateComponent"));
 var _additional = _interopRequireDefault(require("./additional"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
  * Validates all components within a container.
  * @param {object} container The container to validate.
@@ -33,9 +36,12 @@ var validateContainer = function validateContainer(container, outerData, formDat
   if (Array.isArray(container.components)) {
     var containerData = outerData && container.fieldId ? outerData[container.fieldId] : outerData;
     container.components.forEach(function (component) {
-      var full_path = "".concat(container.full_path || container.fieldId, ".").concat(component.fieldId);
+      // It is possible that the container being passed in is a
+      // dummy container just for validation. In that scenario we want 
+      // to ignore the full_path and just use the component's fieldId.
+      var fullPath = container.full_path || container.fieldId ? "".concat(container.full_path || container.fieldId, ".").concat(component.fieldId) : component.fieldId;
       errors.push((0, _validateComponent.default)(_objectSpread(_objectSpread({}, component), {}, {
-        full_path: full_path
+        full_path: fullPath
       }), containerData, fd));
     });
   }

package/dist/utils/Validate/validateContainer.test.js

@@ -0,0 +1,75 @@
+"use strict";
+
+var _models = require("../../models");
+var _validateContainer = _interopRequireDefault(require("./validateContainer"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+describe('utils.Validate.Container', function () {
+  var setup = function setup(id, type, label, required, additionalValidation) {
+    return {
+      id: id,
+      fieldId: id,
+      type: type,
+      label: label,
+      required: required,
+      additionalValidation: additionalValidation
+    };
+  };
+  it('should return an empty array when the component is null', function () {
+    expect((0, _validateContainer.default)(null, {})).toEqual([]);
+  });
+  it('should return an empty array when the container has an undefined components array', function () {
+    var ID = 'container';
+    var LABEL = 'field';
+    var CONTAINER = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false);
+    expect((0, _validateContainer.default)(CONTAINER, null)).toEqual([]);
+  });
+  it('should return an empty array when the container has no components', function () {
+    var ID = 'container';
+    var LABEL = 'field';
+    var CONTAINER = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false);
+    CONTAINER.components = [];
+    expect((0, _validateContainer.default)(CONTAINER, null)).toEqual([]);
+  });
+  it('should return an empty array when the container has only valid components', function () {
+    var EMAIL_ID = 'email';
+    var EMAIL_LABEL = 'Email';
+    var EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
+    var ID = 'container';
+    var LABEL = 'field';
+    var CONTAINER = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false);
+    CONTAINER.components = [EMAIL];
+    var DATA = _defineProperty({}, ID, _defineProperty({}, EMAIL_ID, 'alpha.bravo@digital.homeoffice.gov.uk'));
+    expect((0, _validateContainer.default)(CONTAINER, DATA)).toEqual([]);
+  });
+  it('should return an array containing an error when the container has an invalid component', function () {
+    var EMAIL_ID = 'email';
+    var EMAIL_LABEL = 'Email';
+    var EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
+    var ID = 'container';
+    var LABEL = 'field';
+    var CONTAINER = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false);
+    CONTAINER.components = [EMAIL];
+    var DATA = _defineProperty({}, ID, _defineProperty({}, EMAIL_ID, 'alpha.bravo@digital.homeoffice.com'));
+    expect((0, _validateContainer.default)(CONTAINER, DATA)).toEqual([{
+      id: "".concat(ID, ".").concat(EMAIL_ID),
+      error: "Enter ".concat(EMAIL_LABEL.toLowerCase(), " in the correct format, like jane.doe@homeoffice.gov.uk")
+    }]);
+  });
+  it('should apply optional validators when specified', function () {
+    var ID = 'container';
+    var DATA = {};
+    var ADDITIONAL_VALIDATION = [{
+      function: 'mustEnterAtLeastOne',
+      message: 'Must enter at least one'
+    }];
+    var COMPONENT = setup(ID, _models.ComponentTypes.DATE, null, false, ADDITIONAL_VALIDATION);
+    expect((0, _validateContainer.default)(COMPONENT, DATA)).toEqual({
+      error: 'Must enter at least one',
+      id: ID
+    });
+  });
+});

package/dist/utils/Validate/validateDate.js

@@ -13,8 +13,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 _dayjs.default.extend(_customParseFormat.default);
 _dayjs.default.extend(_isToday.default);
@@ -22,7 +22,8 @@ _dayjs.default.extend(_isLeapYear.default);
 var maxMonthDays = function maxMonthDays(month, year) {
   if (month === '02') {
     return (0, _dayjs.default)().year(year).isLeapYear() ? 29 : 28;
-  } else if (['04', '06', '09', '11'].includes(month)) {
+  }
+  if (['04', '06', '09', '11'].includes(month)) {
     return 30;
   }
   return 31;

package/dist/utils/Validate/validateDate.test.js

@@ -0,0 +1,114 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _validateDate = _interopRequireWildcard(require("./validateDate"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+describe('utils', function () {
+  describe('Validate', function () {
+    describe('date', function () {
+      test('should return no error when the value is an empty string', function () {
+        expect((0, _validateDate.default)('', 'DD-MM-YYYY')).toEqual({
+          message: undefined,
+          propsInError: undefined
+        });
+      });
+      test('should return undefined if a date string is valid', function () {
+        var output = (0, _validateDate.default)('28-02-2024', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: undefined,
+          propsInError: undefined
+        });
+      });
+      test('should return undefined to a correct leap year date', function () {
+        var output = (0, _validateDate.default)('29-02-2024', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: undefined,
+          propsInError: undefined
+        });
+      });
+      test('should validate false if NOT a leap year & 29 Feb is entered', function () {
+        var output = (0, _validateDate.default)('29-02-2023', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Day must be between 1 and 28',
+          propsInError: {
+            day: true
+          }
+        });
+      });
+      test('should return an error if no year is given', function () {
+        var output = (0, _validateDate.default)('29-02-', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Date must include a year',
+          propsInError: {
+            year: true
+          }
+        });
+      });
+      test('should return an error if the year contains less than 4 numbers', function () {
+        var output = (0, _validateDate.default)('29-02-20', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Year must be 4 numbers',
+          propsInError: {
+            year: true
+          }
+        });
+      });
+      test('should return an error if the year contains more than 4 numbers', function () {
+        var output = (0, _validateDate.default)('29-02-20202', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Year must be 4 numbers',
+          propsInError: {
+            year: true
+          }
+        });
+      });
+      test('should return an error if no month is given', function () {
+        var output = (0, _validateDate.default)('29--2020', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Date must include a month',
+          propsInError: {
+            month: true
+          }
+        });
+      });
+      test('should return an error if the month is not between 1 and 12', function () {
+        var output = (0, _validateDate.default)('29-14-2020', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Month must be between 1 and 12',
+          propsInError: {
+            month: true
+          }
+        });
+      });
+      test('should return an error if no day is given', function () {
+        var output = (0, _validateDate.default)('-03-2020', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Date must include a day',
+          propsInError: {
+            day: true
+          }
+        });
+      });
+      test('should return an error if the day is not between 1 and 31', function () {
+        var output = (0, _validateDate.default)('45-12-2020', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Day must be between 1 and 31',
+          propsInError: {
+            day: true
+          }
+        });
+      });
+      test('should correctly identify the maximum numbers of days in a given month and year', function () {
+        var max = (0, _validateDate.maxMonthDays)('02', '2024');
+        expect(max).toEqual(29);
+        max = (0, _validateDate.maxMonthDays)('02', '2023');
+        expect(max).toEqual(28);
+        max = (0, _validateDate.maxMonthDays)('06', '2023');
+        expect(max).toEqual(30);
+        max = (0, _validateDate.maxMonthDays)('07', '2023');
+        expect(max).toEqual(31);
+      });
+    });
+  });
+});

package/dist/utils/Validate/validateEmail.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+// eslint-disable-next-line no-control-regex
+// const EMAIL_REGEX = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/i;
 var HODS_EMAIL_REGEX = /^[a-z0-9._-]+@(digital\.)?homeoffice.gov.uk$/i;
 
 /**
@@ -14,17 +16,28 @@ var HODS_EMAIL_REGEX = /^[a-z0-9._-]+@(digital\.)?homeoffice.gov.uk$/i;
  * validateRequired (Validate.required) for that sort of validation.
  * @param {*} value The value to validate.
  * @param {string} label The label to use in any error message.
+ * @param {array} customErrors The array of custom errors to use for format message.
  * @returns An error if the email address is invalid.
  */
 var validateEmail = function validateEmail(value) {
   var label = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var customErrors = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  // eslint-disable-next-line no-extra-boolean-cast
   if (!!value) {
+    var name = label ? label.toLowerCase() : 'email address';
     if (typeof value === 'string') {
       if (HODS_EMAIL_REGEX.test(value)) {
         return undefined;
       }
     }
-    var name = label ? label.toLowerCase() : 'email address';
+    if (Array.isArray(customErrors)) {
+      var result = customErrors.filter(function (error) {
+        return error.type === 'format';
+      });
+      if (result && result.length > 0 && result[0].message) {
+        return result[0].message;
+      }
+    }
     return "Enter ".concat(name, " in the correct format, like jane.doe@homeoffice.gov.uk");
   }
   return undefined;