@scenid/react-formulator 1.2.2 → 1.2.3

package/dist/index.cjs.js

@@ -20513,90 +20513,149 @@ function requireCompiler () {
 		      return compileTypeDefinition;
 		    }()
 		  }, {
-		    key: "compileField",
+		    key: "compileOptions",
 		    value: function () {
-		      var _compileField = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(uncompiledField, name) {
-		        var field, prohibited, required, optional, type, defaultDef;
+		      var _compileOptions = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(options) {
+		        var res;
 		        return _regenerator["default"].wrap(function _callee9$(_context9) {
 		          while (1) {
 		            switch (_context9.prev = _context9.next) {
+		              case 0:
+		                if (!((0, _helpers.isObject)(options) && options.$ref !== undefined)) {
+		                  _context9.next = 7;
+		                  break;
+		                }
+
+		                _context9.next = 3;
+		                return this.resolveRef(options.$ref);
+
+		              case 3:
+		                res = _context9.sent;
+
+		                if (!(0, _helpers.isObject)(res)) {
+		                  _context9.next = 6;
+		                  break;
+		                }
+
+		                return _context9.abrupt("return", Object.keys(res));
+
+		              case 6:
+		                return _context9.abrupt("return", res);
+
+		              case 7:
+		                return _context9.abrupt("return", options);
+
+		              case 8:
+		              case "end":
+		                return _context9.stop();
+		            }
+		          }
+		        }, _callee9, this);
+		      }));
+
+		      function compileOptions(_x12) {
+		        return _compileOptions.apply(this, arguments);
+		      }
+
+		      return compileOptions;
+		    }()
+		  }, {
+		    key: "compileField",
+		    value: function () {
+		      var _compileField = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(uncompiledField, name) {
+		        var field, prohibited, required, optional, type, defaultDef, options;
+		        return _regenerator["default"].wrap(function _callee10$(_context10) {
+		          while (1) {
+		            switch (_context10.prev = _context10.next) {
 		              case 0:
 		                field = (0, _helpers.deepCopy)(uncompiledField);
-		                prohibited = field.prohibited, required = field.required, optional = field.optional, type = field.type, defaultDef = field["default"];
+		                prohibited = field.prohibited, required = field.required, optional = field.optional, type = field.type, defaultDef = field["default"], options = field.options;
 
 		                if (!(type === undefined)) {
-		                  _context9.next = 4;
+		                  _context10.next = 4;
 		                  break;
 		                }
 
 		                throw new _Error.SchemaError("Field \"".concat(name, "\" is missing a type definition"));
 
 		              case 4:
-		                _context9.next = 6;
+		                _context10.next = 6;
 		                return this.compileTypeDefinition(type, name);
 
 		              case 6:
-		                field.type = _context9.sent;
+		                field.type = _context10.sent;
 
 		                if (!(defaultDef !== undefined)) {
-		                  _context9.next = 11;
+		                  _context10.next = 11;
 		                  break;
 		                }
 
-		                _context9.next = 10;
+		                _context10.next = 10;
 		                return this.compileTypeDefinition(defaultDef, name);
 
 		              case 10:
-		                field["default"] = _context9.sent;
+		                field["default"] = _context10.sent;
 
 		              case 11:
-		                if (!(prohibited !== undefined)) {
-		                  _context9.next = 15;
+		                if (!options) {
+		                  _context10.next = 15;
 		                  break;
 		                }
 
-		                _context9.next = 14;
-		                return this.compileRules(prohibited, name);
+		                _context10.next = 14;
+		                return this.compileOptions(options);
 
 		              case 14:
-		                field.prohibited = _context9.sent;
+		                field.options = _context10.sent;
 
 		              case 15:
-		                if (!(required !== undefined)) {
-		                  _context9.next = 19;
+		                if (!(prohibited !== undefined)) {
+		                  _context10.next = 19;
 		                  break;
 		                }
 
-		                _context9.next = 18;
-		                return this.compileRules(required, name);
+		                _context10.next = 18;
+		                return this.compileRules(prohibited, name);
 
 		              case 18:
-		                field.required = _context9.sent;
+		                field.prohibited = _context10.sent;
 
 		              case 19:
-		                if (!(optional !== undefined)) {
-		                  _context9.next = 23;
+		                if (!(required !== undefined)) {
+		                  _context10.next = 23;
 		                  break;
 		                }
 
-		                _context9.next = 22;
-		                return this.compileRules(optional, name);
+		                _context10.next = 22;
+		                return this.compileRules(required, name);
 
 		              case 22:
-		                field.optional = _context9.sent;
+		                field.required = _context10.sent;
 
 		              case 23:
-		                return _context9.abrupt("return", field);
+		                if (!(optional !== undefined)) {
+		                  _context10.next = 27;
+		                  break;
+		                }
+
+		                _context10.next = 26;
+		                return this.compileRules(optional, name);
 
-		              case 24:
+		              case 26:
+		                field.optional = _context10.sent;
+
+		              case 27:
+		                return _context10.abrupt("return", field);
+
+		              case 28:
 		              case "end":
-		                return _context9.stop();
+		                return _context10.stop();
 		            }
 		          }
-		        }, _callee9, this);
+		        }, _callee10, this);
 		      }));
 
-		      function compileField(_x12, _x13) {
+		      function compileField(_x13, _x14) {
 		        return _compileField.apply(this, arguments);
 		      }
 
@@ -20605,135 +20664,135 @@ function requireCompiler () {
 		  }, {
 		    key: "compileCatalog",
 		    value: function () {
-		      var _compileCatalog = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(uncompiledCatalog) {
+		      var _compileCatalog = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(uncompiledCatalog) {
 		        var _this2 = this;
 
 		        var catalog, result;
-		        return _regenerator["default"].wrap(function _callee12$(_context12) {
+		        return _regenerator["default"].wrap(function _callee13$(_context13) {
 		          while (1) {
-		            switch (_context12.prev = _context12.next) {
+		            switch (_context13.prev = _context13.next) {
 		              case 0:
 		                catalog = (0, _helpers.deepCopy)(uncompiledCatalog);
 
 		                if ((0, _helpers.isObject)(catalog)) {
-		                  _context12.next = 3;
+		                  _context13.next = 3;
 		                  break;
 		                }
 
 		                throw new _Error.SchemaError("Invalid type of \"".concat((0, _typeof2["default"])(catalog), "\" for catalog."));
 
 		              case 3:
-		                _context12.next = 5;
+		                _context13.next = 5;
 		                return Promise.all(Object.entries(catalog).map( /*#__PURE__*/function () {
-		                  var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(e) {
-		                    return _regenerator["default"].wrap(function _callee11$(_context11) {
+		                  var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(e) {
+		                    return _regenerator["default"].wrap(function _callee12$(_context12) {
 		                      while (1) {
-		                        switch (_context11.prev = _context11.next) {
+		                        switch (_context12.prev = _context12.next) {
 		                          case 0:
 		                            if (!(0, _helpers.isObject)(e[1])) {
-		                              _context11.next = 2;
+		                              _context12.next = 2;
 		                              break;
 		                            }
 
-		                            return _context11.abrupt("return", (0, _defineProperty2["default"])({}, e[0], e[1]));
+		                            return _context12.abrupt("return", (0, _defineProperty2["default"])({}, e[0], e[1]));
 
 		                          case 2:
 		                            if (Array.isArray(e[1])) {
-		                              _context11.next = 4;
+		                              _context12.next = 4;
 		                              break;
 		                            }
 
 		                            throw new _Error.SchemaError("Invalid type of \"".concat((0, _typeof2["default"])(e[1]), "\" for catalog at path \"").concat(e[0], "\"."));
 
 		                          case 4:
-		                            _context11.t0 = _defineProperty2["default"];
-		                            _context11.t1 = {};
-		                            _context11.t2 = e[0];
-		                            _context11.next = 9;
+		                            _context12.t0 = _defineProperty2["default"];
+		                            _context12.t1 = {};
+		                            _context12.t2 = e[0];
+		                            _context12.next = 9;
 		                            return Promise.all(e[1].map( /*#__PURE__*/function () {
-		                              var _ref8 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(ee) {
+		                              var _ref8 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(ee) {
 		                                var res;
-		                                return _regenerator["default"].wrap(function _callee10$(_context10) {
+		                                return _regenerator["default"].wrap(function _callee11$(_context11) {
 		                                  while (1) {
-		                                    switch (_context10.prev = _context10.next) {
+		                                    switch (_context11.prev = _context11.next) {
 		                                      case 0:
 		                                        if ((0, _helpers.isObject)(ee)) {
-		                                          _context10.next = 2;
+		                                          _context11.next = 2;
 		                                          break;
 		                                        }
 
-		                                        return _context10.abrupt("return", ee);
+		                                        return _context11.abrupt("return", ee);
 
 		                                      case 2:
 		                                        if (!(ee.$ref === undefined)) {
-		                                          _context10.next = 4;
+		                                          _context11.next = 4;
 		                                          break;
 		                                        }
 
 		                                        throw new _Error.SchemaError("Objects inside a catalog Array need to define a $ref at path \"".concat(e[0], "\"."));
 
 		                                      case 4:
-		                                        _context10.next = 6;
+		                                        _context11.next = 6;
 		                                        return _this2.resolveRef(ee.$ref);
 
 		                                      case 6:
-		                                        res = _context10.sent;
+		                                        res = _context11.sent;
 
 		                                        if (!(0, _helpers.isObject)(res)) {
-		                                          _context10.next = 9;
+		                                          _context11.next = 9;
 		                                          break;
 		                                        }
 
-		                                        return _context10.abrupt("return", Object.keys(res));
+		                                        return _context11.abrupt("return", Object.keys(res));
 
 		                                      case 9:
-		                                        return _context10.abrupt("return", res);
+		                                        return _context11.abrupt("return", res);
 
 		                                      case 10:
 		                                      case "end":
-		                                        return _context10.stop();
+		                                        return _context11.stop();
 		                                    }
 		                                  }
-		                                }, _callee10);
+		                                }, _callee11);
 		                              }));
 
-		                              return function (_x16) {
+		                              return function (_x17) {
 		                                return _ref8.apply(this, arguments);
 		                              };
 		                            }()));
 
 		                          case 9:
-		                            _context11.t3 = _context11.sent;
-		                            return _context11.abrupt("return", (0, _context11.t0)(_context11.t1, _context11.t2, _context11.t3));
+		                            _context12.t3 = _context12.sent;
+		                            return _context12.abrupt("return", (0, _context12.t0)(_context12.t1, _context12.t2, _context12.t3));
 
 		                          case 11:
 		                          case "end":
-		                            return _context11.stop();
+		                            return _context12.stop();
 		                        }
 		                      }
-		                    }, _callee11);
+		                    }, _callee12);
 		                  }));
 
-		                  return function (_x15) {
+		                  return function (_x16) {
 		                    return _ref6.apply(this, arguments);
 		                  };
 		                }()));
 
 		              case 5:
-		                result = _context12.sent;
-		                return _context12.abrupt("return", result.reduce(function (l, r) {
+		                result = _context13.sent;
+		                return _context13.abrupt("return", result.reduce(function (l, r) {
 		                  return _objectSpread(_objectSpread({}, l), r);
 		                }, {}));
 
 		              case 7:
 		              case "end":
-		                return _context12.stop();
+		                return _context13.stop();
 		            }
 		          }
-		        }, _callee12);
+		        }, _callee13);
 		      }));
 
-		      function compileCatalog(_x14) {
+		      function compileCatalog(_x15) {
 		        return _compileCatalog.apply(this, arguments);
 		      }
 
@@ -20742,16 +20801,16 @@ function requireCompiler () {
 		  }, {
 		    key: "process",
 		    value: function () {
-		      var _process = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(schemaArg, resolver) {
+		      var _process = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14(schemaArg, resolver) {
 		        var schema, catalog, properties, fieldNames, i, name, field;
-		        return _regenerator["default"].wrap(function _callee13$(_context13) {
+		        return _regenerator["default"].wrap(function _callee14$(_context14) {
 		          while (1) {
-		            switch (_context13.prev = _context13.next) {
+		            switch (_context14.prev = _context14.next) {
 		              case 0:
 		                this.resolver = resolver;
 
 		                if ((0, _helpers.isObject)(schemaArg)) {
-		                  _context13.next = 3;
+		                  _context14.next = 3;
 		                  break;
 		                }
 
@@ -20764,15 +20823,15 @@ function requireCompiler () {
 		                catalog = schema.catalog, properties = schema.properties;
 
 		                if (!(catalog !== undefined)) {
-		                  _context13.next = 11;
+		                  _context14.next = 11;
 		                  break;
 		                }
 
-		                _context13.next = 10;
+		                _context14.next = 10;
 		                return this.compileCatalog(catalog);
 
 		              case 10:
-		                schema.catalog = _context13.sent;
+		                schema.catalog = _context14.sent;
 
 		              case 11:
 		                fieldNames = Object.keys(properties);
@@ -20780,35 +20839,35 @@ function requireCompiler () {
 
 		              case 13:
 		                if (!(i < fieldNames.length)) {
-		                  _context13.next = 22;
+		                  _context14.next = 22;
 		                  break;
 		                }
 
 		                name = fieldNames[i];
 		                field = properties[name];
-		                _context13.next = 18;
+		                _context14.next = 18;
 		                return this.compileField(field, name);
 
 		              case 18:
-		                properties[name] = _context13.sent;
+		                properties[name] = _context14.sent;
 
 		              case 19:
 		                i++;
-		                _context13.next = 13;
+		                _context14.next = 13;
 		                break;
 
 		              case 22:
-		                return _context13.abrupt("return", schema);
+		                return _context14.abrupt("return", schema);
 
 		              case 23:
 		              case "end":
-		                return _context13.stop();
+		                return _context14.stop();
 		            }
 		          }
-		        }, _callee13, this);
+		        }, _callee14, this);
 		      }));
 
-		      function process(_x17, _x18) {
+		      function process(_x18, _x19) {
 		        return _process.apply(this, arguments);
 		      }
 
@@ -28521,6 +28580,11 @@ function requireTypeValidator () {
 		  return value === String(other[as]);
 		};
 
+		_validator["default"].isZipCode = function (value, _ref3, other) {
+		  var localeFrom = _ref3.localeFrom;
+		  return _validator["default"].isPostalCode(value, String(other[localeFrom]) || 'any');
+		};
+
 		var _default = _validator["default"];
 		exports["default"] = _default;
 } (TypeValidator));
@@ -28541,6 +28605,8 @@ function requireValidator () {
 		});
 		exports["default"] = void 0;
 
+		var _defineProperty2 = _interopRequireDefault(requireDefineProperty());
+
 		var _typeof2 = _interopRequireDefault(require_typeof());
 
 		var _classCallCheck2 = _interopRequireDefault(requireClassCallCheck());
@@ -28553,6 +28619,10 @@ function requireValidator () {
 
 		var _Error = require_Error();
 
+		function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 		var ValidationResult = /*#__PURE__*/function () {
 		  function ValidationResult() {
 		    (0, _classCallCheck2["default"])(this, ValidationResult);
@@ -28704,8 +28774,7 @@ function requireValidator () {
 		          prohibited = _schema$name.prohibited,
 		          required = _schema$name.required,
 		          optional = _schema$name.optional,
-		          type = _schema$name.type,
-		          defaultVal = _schema$name["default"];
+		          type = _schema$name.type;
 		      var value = data[name];
 		      var hasProhibited = prohibited !== undefined;
 		      var hasRequired = required !== undefined;
@@ -28716,7 +28785,7 @@ function requireValidator () {
 		      var isRequired = hasRequired && this.validateRules(name, required, data);
 		      if (!isRequired && !isProhibited && optional === true) isOptional = true;
 
-		      if (isRequired && defaultVal === undefined && _TypeValidator["default"].isEmpty(value)) {
+		      if (isRequired && _TypeValidator["default"].isEmpty(value)) {
 		        return new FieldResult(name, data[name], undefined, isProhibited, isRequired, isOptional, true, [{
 		          message: "\"".concat(name, "\" is required"),
 		          path: name,
@@ -28727,10 +28796,6 @@ function requireValidator () {
 
 		      if (!isOptional && !isRequired) return new FieldResult(name, data[name], undefined, isProhibited, isRequired, isOptional);
 
-		      if (_TypeValidator["default"].isEmpty(value) && defaultVal !== undefined) {
-		        return new FieldResult(name, data[name], this.castType(name, type, defaultVal), isProhibited, isRequired, isOptional);
-		      }
-
 		      if (_TypeValidator["default"].isEmpty(value) && isOptional) {
 		        return new FieldResult(name, data[name], undefined, isProhibited, isRequired, isOptional);
 		      }
@@ -28759,12 +28824,25 @@ function requireValidator () {
 		      if (!(0, _helpers.isObject)(dirtyData)) throw new Error('No data to validate.');
 		      var properties = schema.properties;
 		      var fields = Object.entries(properties);
-		      var result = new ValidationResult();
+		      var result = new ValidationResult(); // populate default values
+
+		      var populatedData = _objectSpread({}, dirtyData);
 
 		      for (var i = 0; i < fields.length; i++) {
 		        var field = fields[i];
 		        var name = field[0];
-		        result.add(this.validateField(name, properties, dirtyData));
+		        var type = field[1].type;
+		        var defaultVal = field[1]["default"];
+
+		        if (populatedData[name] === undefined && defaultVal !== undefined) {
+		          populatedData[name] = this.castType(name, type, defaultVal);
+		        }
+		      }
+
+		      for (var _i = 0; _i < fields.length; _i++) {
+		        var _field = fields[_i];
+		        var _name = _field[0];
+		        result.add(this.validateField(_name, properties, populatedData));
 		      }
 
 		      return result;

package/dist/index.esm.js

@@ -20473,90 +20473,149 @@ function requireCompiler () {
 		      return compileTypeDefinition;
 		    }()
 		  }, {
-		    key: "compileField",
+		    key: "compileOptions",
 		    value: function () {
-		      var _compileField = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(uncompiledField, name) {
-		        var field, prohibited, required, optional, type, defaultDef;
+		      var _compileOptions = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(options) {
+		        var res;
 		        return _regenerator["default"].wrap(function _callee9$(_context9) {
 		          while (1) {
 		            switch (_context9.prev = _context9.next) {
+		              case 0:
+		                if (!((0, _helpers.isObject)(options) && options.$ref !== undefined)) {
+		                  _context9.next = 7;
+		                  break;
+		                }
+
+		                _context9.next = 3;
+		                return this.resolveRef(options.$ref);
+
+		              case 3:
+		                res = _context9.sent;
+
+		                if (!(0, _helpers.isObject)(res)) {
+		                  _context9.next = 6;
+		                  break;
+		                }
+
+		                return _context9.abrupt("return", Object.keys(res));
+
+		              case 6:
+		                return _context9.abrupt("return", res);
+
+		              case 7:
+		                return _context9.abrupt("return", options);
+
+		              case 8:
+		              case "end":
+		                return _context9.stop();
+		            }
+		          }
+		        }, _callee9, this);
+		      }));
+
+		      function compileOptions(_x12) {
+		        return _compileOptions.apply(this, arguments);
+		      }
+
+		      return compileOptions;
+		    }()
+		  }, {
+		    key: "compileField",
+		    value: function () {
+		      var _compileField = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(uncompiledField, name) {
+		        var field, prohibited, required, optional, type, defaultDef, options;
+		        return _regenerator["default"].wrap(function _callee10$(_context10) {
+		          while (1) {
+		            switch (_context10.prev = _context10.next) {
 		              case 0:
 		                field = (0, _helpers.deepCopy)(uncompiledField);
-		                prohibited = field.prohibited, required = field.required, optional = field.optional, type = field.type, defaultDef = field["default"];
+		                prohibited = field.prohibited, required = field.required, optional = field.optional, type = field.type, defaultDef = field["default"], options = field.options;
 
 		                if (!(type === undefined)) {
-		                  _context9.next = 4;
+		                  _context10.next = 4;
 		                  break;
 		                }
 
 		                throw new _Error.SchemaError("Field \"".concat(name, "\" is missing a type definition"));
 
 		              case 4:
-		                _context9.next = 6;
+		                _context10.next = 6;
 		                return this.compileTypeDefinition(type, name);
 
 		              case 6:
-		                field.type = _context9.sent;
+		                field.type = _context10.sent;
 
 		                if (!(defaultDef !== undefined)) {
-		                  _context9.next = 11;
+		                  _context10.next = 11;
 		                  break;
 		                }
 
-		                _context9.next = 10;
+		                _context10.next = 10;
 		                return this.compileTypeDefinition(defaultDef, name);
 
 		              case 10:
-		                field["default"] = _context9.sent;
+		                field["default"] = _context10.sent;
 
 		              case 11:
-		                if (!(prohibited !== undefined)) {
-		                  _context9.next = 15;
+		                if (!options) {
+		                  _context10.next = 15;
 		                  break;
 		                }
 
-		                _context9.next = 14;
-		                return this.compileRules(prohibited, name);
+		                _context10.next = 14;
+		                return this.compileOptions(options);
 
 		              case 14:
-		                field.prohibited = _context9.sent;
+		                field.options = _context10.sent;
 
 		              case 15:
-		                if (!(required !== undefined)) {
-		                  _context9.next = 19;
+		                if (!(prohibited !== undefined)) {
+		                  _context10.next = 19;
 		                  break;
 		                }
 
-		                _context9.next = 18;
-		                return this.compileRules(required, name);
+		                _context10.next = 18;
+		                return this.compileRules(prohibited, name);
 
 		              case 18:
-		                field.required = _context9.sent;
+		                field.prohibited = _context10.sent;
 
 		              case 19:
-		                if (!(optional !== undefined)) {
-		                  _context9.next = 23;
+		                if (!(required !== undefined)) {
+		                  _context10.next = 23;
 		                  break;
 		                }
 
-		                _context9.next = 22;
-		                return this.compileRules(optional, name);
+		                _context10.next = 22;
+		                return this.compileRules(required, name);
 
 		              case 22:
-		                field.optional = _context9.sent;
+		                field.required = _context10.sent;
 
 		              case 23:
-		                return _context9.abrupt("return", field);
+		                if (!(optional !== undefined)) {
+		                  _context10.next = 27;
+		                  break;
+		                }
+
+		                _context10.next = 26;
+		                return this.compileRules(optional, name);
 
-		              case 24:
+		              case 26:
+		                field.optional = _context10.sent;
+
+		              case 27:
+		                return _context10.abrupt("return", field);
+
+		              case 28:
 		              case "end":
-		                return _context9.stop();
+		                return _context10.stop();
 		            }
 		          }
-		        }, _callee9, this);
+		        }, _callee10, this);
 		      }));
 
-		      function compileField(_x12, _x13) {
+		      function compileField(_x13, _x14) {
 		        return _compileField.apply(this, arguments);
 		      }
 
@@ -20565,135 +20624,135 @@ function requireCompiler () {
 		  }, {
 		    key: "compileCatalog",
 		    value: function () {
-		      var _compileCatalog = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(uncompiledCatalog) {
+		      var _compileCatalog = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(uncompiledCatalog) {
 		        var _this2 = this;
 
 		        var catalog, result;
-		        return _regenerator["default"].wrap(function _callee12$(_context12) {
+		        return _regenerator["default"].wrap(function _callee13$(_context13) {
 		          while (1) {
-		            switch (_context12.prev = _context12.next) {
+		            switch (_context13.prev = _context13.next) {
 		              case 0:
 		                catalog = (0, _helpers.deepCopy)(uncompiledCatalog);
 
 		                if ((0, _helpers.isObject)(catalog)) {
-		                  _context12.next = 3;
+		                  _context13.next = 3;
 		                  break;
 		                }
 
 		                throw new _Error.SchemaError("Invalid type of \"".concat((0, _typeof2["default"])(catalog), "\" for catalog."));
 
 		              case 3:
-		                _context12.next = 5;
+		                _context13.next = 5;
 		                return Promise.all(Object.entries(catalog).map( /*#__PURE__*/function () {
-		                  var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(e) {
-		                    return _regenerator["default"].wrap(function _callee11$(_context11) {
+		                  var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(e) {
+		                    return _regenerator["default"].wrap(function _callee12$(_context12) {
 		                      while (1) {
-		                        switch (_context11.prev = _context11.next) {
+		                        switch (_context12.prev = _context12.next) {
 		                          case 0:
 		                            if (!(0, _helpers.isObject)(e[1])) {
-		                              _context11.next = 2;
+		                              _context12.next = 2;
 		                              break;
 		                            }
 
-		                            return _context11.abrupt("return", (0, _defineProperty2["default"])({}, e[0], e[1]));
+		                            return _context12.abrupt("return", (0, _defineProperty2["default"])({}, e[0], e[1]));
 
 		                          case 2:
 		                            if (Array.isArray(e[1])) {
-		                              _context11.next = 4;
+		                              _context12.next = 4;
 		                              break;
 		                            }
 
 		                            throw new _Error.SchemaError("Invalid type of \"".concat((0, _typeof2["default"])(e[1]), "\" for catalog at path \"").concat(e[0], "\"."));
 
 		                          case 4:
-		                            _context11.t0 = _defineProperty2["default"];
-		                            _context11.t1 = {};
-		                            _context11.t2 = e[0];
-		                            _context11.next = 9;
+		                            _context12.t0 = _defineProperty2["default"];
+		                            _context12.t1 = {};
+		                            _context12.t2 = e[0];
+		                            _context12.next = 9;
 		                            return Promise.all(e[1].map( /*#__PURE__*/function () {
-		                              var _ref8 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(ee) {
+		                              var _ref8 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(ee) {
 		                                var res;
-		                                return _regenerator["default"].wrap(function _callee10$(_context10) {
+		                                return _regenerator["default"].wrap(function _callee11$(_context11) {
 		                                  while (1) {
-		                                    switch (_context10.prev = _context10.next) {
+		                                    switch (_context11.prev = _context11.next) {
 		                                      case 0:
 		                                        if ((0, _helpers.isObject)(ee)) {
-		                                          _context10.next = 2;
+		                                          _context11.next = 2;
 		                                          break;
 		                                        }
 
-		                                        return _context10.abrupt("return", ee);
+		                                        return _context11.abrupt("return", ee);
 
 		                                      case 2:
 		                                        if (!(ee.$ref === undefined)) {
-		                                          _context10.next = 4;
+		                                          _context11.next = 4;
 		                                          break;
 		                                        }
 
 		                                        throw new _Error.SchemaError("Objects inside a catalog Array need to define a $ref at path \"".concat(e[0], "\"."));
 
 		                                      case 4:
-		                                        _context10.next = 6;
+		                                        _context11.next = 6;
 		                                        return _this2.resolveRef(ee.$ref);
 
 		                                      case 6:
-		                                        res = _context10.sent;
+		                                        res = _context11.sent;
 
 		                                        if (!(0, _helpers.isObject)(res)) {
-		                                          _context10.next = 9;
+		                                          _context11.next = 9;
 		                                          break;
 		                                        }
 
-		                                        return _context10.abrupt("return", Object.keys(res));
+		                                        return _context11.abrupt("return", Object.keys(res));
 
 		                                      case 9:
-		                                        return _context10.abrupt("return", res);
+		                                        return _context11.abrupt("return", res);
 
 		                                      case 10:
 		                                      case "end":
-		                                        return _context10.stop();
+		                                        return _context11.stop();
 		                                    }
 		                                  }
-		                                }, _callee10);
+		                                }, _callee11);
 		                              }));
 
-		                              return function (_x16) {
+		                              return function (_x17) {
 		                                return _ref8.apply(this, arguments);
 		                              };
 		                            }()));
 
 		                          case 9:
-		                            _context11.t3 = _context11.sent;
-		                            return _context11.abrupt("return", (0, _context11.t0)(_context11.t1, _context11.t2, _context11.t3));
+		                            _context12.t3 = _context12.sent;
+		                            return _context12.abrupt("return", (0, _context12.t0)(_context12.t1, _context12.t2, _context12.t3));
 
 		                          case 11:
 		                          case "end":
-		                            return _context11.stop();
+		                            return _context12.stop();
 		                        }
 		                      }
-		                    }, _callee11);
+		                    }, _callee12);
 		                  }));
 
-		                  return function (_x15) {
+		                  return function (_x16) {
 		                    return _ref6.apply(this, arguments);
 		                  };
 		                }()));
 
 		              case 5:
-		                result = _context12.sent;
-		                return _context12.abrupt("return", result.reduce(function (l, r) {
+		                result = _context13.sent;
+		                return _context13.abrupt("return", result.reduce(function (l, r) {
 		                  return _objectSpread(_objectSpread({}, l), r);
 		                }, {}));
 
 		              case 7:
 		              case "end":
-		                return _context12.stop();
+		                return _context13.stop();
 		            }
 		          }
-		        }, _callee12);
+		        }, _callee13);
 		      }));
 
-		      function compileCatalog(_x14) {
+		      function compileCatalog(_x15) {
 		        return _compileCatalog.apply(this, arguments);
 		      }
 
@@ -20702,16 +20761,16 @@ function requireCompiler () {
 		  }, {
 		    key: "process",
 		    value: function () {
-		      var _process = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(schemaArg, resolver) {
+		      var _process = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14(schemaArg, resolver) {
 		        var schema, catalog, properties, fieldNames, i, name, field;
-		        return _regenerator["default"].wrap(function _callee13$(_context13) {
+		        return _regenerator["default"].wrap(function _callee14$(_context14) {
 		          while (1) {
-		            switch (_context13.prev = _context13.next) {
+		            switch (_context14.prev = _context14.next) {
 		              case 0:
 		                this.resolver = resolver;
 
 		                if ((0, _helpers.isObject)(schemaArg)) {
-		                  _context13.next = 3;
+		                  _context14.next = 3;
 		                  break;
 		                }
 
@@ -20724,15 +20783,15 @@ function requireCompiler () {
 		                catalog = schema.catalog, properties = schema.properties;
 
 		                if (!(catalog !== undefined)) {
-		                  _context13.next = 11;
+		                  _context14.next = 11;
 		                  break;
 		                }
 
-		                _context13.next = 10;
+		                _context14.next = 10;
 		                return this.compileCatalog(catalog);
 
 		              case 10:
-		                schema.catalog = _context13.sent;
+		                schema.catalog = _context14.sent;
 
 		              case 11:
 		                fieldNames = Object.keys(properties);
@@ -20740,35 +20799,35 @@ function requireCompiler () {
 
 		              case 13:
 		                if (!(i < fieldNames.length)) {
-		                  _context13.next = 22;
+		                  _context14.next = 22;
 		                  break;
 		                }
 
 		                name = fieldNames[i];
 		                field = properties[name];
-		                _context13.next = 18;
+		                _context14.next = 18;
 		                return this.compileField(field, name);
 
 		              case 18:
-		                properties[name] = _context13.sent;
+		                properties[name] = _context14.sent;
 
 		              case 19:
 		                i++;
-		                _context13.next = 13;
+		                _context14.next = 13;
 		                break;
 
 		              case 22:
-		                return _context13.abrupt("return", schema);
+		                return _context14.abrupt("return", schema);
 
 		              case 23:
 		              case "end":
-		                return _context13.stop();
+		                return _context14.stop();
 		            }
 		          }
-		        }, _callee13, this);
+		        }, _callee14, this);
 		      }));
 
-		      function process(_x17, _x18) {
+		      function process(_x18, _x19) {
 		        return _process.apply(this, arguments);
 		      }
 
@@ -28481,6 +28540,11 @@ function requireTypeValidator () {
 		  return value === String(other[as]);
 		};
 
+		_validator["default"].isZipCode = function (value, _ref3, other) {
+		  var localeFrom = _ref3.localeFrom;
+		  return _validator["default"].isPostalCode(value, String(other[localeFrom]) || 'any');
+		};
+
 		var _default = _validator["default"];
 		exports["default"] = _default;
 } (TypeValidator));
@@ -28501,6 +28565,8 @@ function requireValidator () {
 		});
 		exports["default"] = void 0;
 
+		var _defineProperty2 = _interopRequireDefault(requireDefineProperty());
+
 		var _typeof2 = _interopRequireDefault(require_typeof());
 
 		var _classCallCheck2 = _interopRequireDefault(requireClassCallCheck());
@@ -28513,6 +28579,10 @@ function requireValidator () {
 
 		var _Error = require_Error();
 
+		function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 		var ValidationResult = /*#__PURE__*/function () {
 		  function ValidationResult() {
 		    (0, _classCallCheck2["default"])(this, ValidationResult);
@@ -28664,8 +28734,7 @@ function requireValidator () {
 		          prohibited = _schema$name.prohibited,
 		          required = _schema$name.required,
 		          optional = _schema$name.optional,
-		          type = _schema$name.type,
-		          defaultVal = _schema$name["default"];
+		          type = _schema$name.type;
 		      var value = data[name];
 		      var hasProhibited = prohibited !== undefined;
 		      var hasRequired = required !== undefined;
@@ -28676,7 +28745,7 @@ function requireValidator () {
 		      var isRequired = hasRequired && this.validateRules(name, required, data);
 		      if (!isRequired && !isProhibited && optional === true) isOptional = true;
 
-		      if (isRequired && defaultVal === undefined && _TypeValidator["default"].isEmpty(value)) {
+		      if (isRequired && _TypeValidator["default"].isEmpty(value)) {
 		        return new FieldResult(name, data[name], undefined, isProhibited, isRequired, isOptional, true, [{
 		          message: "\"".concat(name, "\" is required"),
 		          path: name,
@@ -28687,10 +28756,6 @@ function requireValidator () {
 
 		      if (!isOptional && !isRequired) return new FieldResult(name, data[name], undefined, isProhibited, isRequired, isOptional);
 
-		      if (_TypeValidator["default"].isEmpty(value) && defaultVal !== undefined) {
-		        return new FieldResult(name, data[name], this.castType(name, type, defaultVal), isProhibited, isRequired, isOptional);
-		      }
-
 		      if (_TypeValidator["default"].isEmpty(value) && isOptional) {
 		        return new FieldResult(name, data[name], undefined, isProhibited, isRequired, isOptional);
 		      }
@@ -28719,12 +28784,25 @@ function requireValidator () {
 		      if (!(0, _helpers.isObject)(dirtyData)) throw new Error('No data to validate.');
 		      var properties = schema.properties;
 		      var fields = Object.entries(properties);
-		      var result = new ValidationResult();
+		      var result = new ValidationResult(); // populate default values
+
+		      var populatedData = _objectSpread({}, dirtyData);
 
 		      for (var i = 0; i < fields.length; i++) {
 		        var field = fields[i];
 		        var name = field[0];
-		        result.add(this.validateField(name, properties, dirtyData));
+		        var type = field[1].type;
+		        var defaultVal = field[1]["default"];
+
+		        if (populatedData[name] === undefined && defaultVal !== undefined) {
+		          populatedData[name] = this.castType(name, type, defaultVal);
+		        }
+		      }
+
+		      for (var _i = 0; _i < fields.length; _i++) {
+		        var _field = fields[_i];
+		        var _name = _field[0];
+		        result.add(this.validateField(_name, properties, populatedData));
 		      }
 
 		      return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scenid/react-formulator",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "repository": "https://dennykoch@bitbucket.org/scenid/react-formulator.git",
@@ -49,7 +49,7 @@
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-node-resolve": "^13.2.1",
     "@scenid/cloud-icons": "^2.6.0",
-    "@scenid/formulator": "^2.3.1",
+    "@scenid/formulator": "^2.3.2",
     "@storybook/addon-actions": "^6.4.22",
     "@storybook/addon-essentials": "^6.4.22",
     "@storybook/addon-interactions": "^6.4.22",