@digigov/form 0.8.1 → 0.8.2

package/validators/index.js

@@ -22,6 +22,10 @@ var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customPars
 
 var _utils = require("@digigov/form/validators/utils");
 
+var _number = require("@digigov/form/validators/utils/number");
+
+var _int = require("@digigov/form/validators/utils/int");
+
 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 || _typeof3(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; }
@@ -75,7 +79,7 @@ var getYUPTypeMap = function getYUPTypeMap() {
             max: field.extra.max
           }
         });
-        return arrayValidator; // .required(field.required)
+        return arrayValidator;
       } else if (typeof field.extra.of === 'string') {
         return yup.array().of(yupTypeMap[field.extra.of]());
       } else {
@@ -84,7 +88,9 @@ var getYUPTypeMap = function getYUPTypeMap() {
       }
     },
     "int": function int() {
-      return yup.number().typeError('form.error.number').positive('form.error.positive_number');
+      return yup.mixed().transform(function (_, val) {
+        return val !== '' ? Number(val) : null;
+      }).test((0, _number.NUMBER_VALIDATOR)()).test((0, _int.INT_VALIDATOR)());
     },
     email: function email() {
       return yup.string().email('form.error.email');

package/validators/utils/int.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.INT_VALIDATOR = void 0;
+exports.validateIntNumber = validateIntNumber;
+
+function validateIntNumber(number) {
+  if (number === undefined) {
+    return false;
+  } else {
+    return Number.isInteger(number) && Number(number) > 0;
+  }
+}
+
+var INT_VALIDATOR = function INT_VALIDATOR() {
+  return {
+    name: 'int-validator',
+    message: 'form.error.positive_integer_number',
+    test: function test(value) {
+      if (value === null) {
+        return true;
+      }
+
+      return validateIntNumber(value);
+    }
+  };
+};
+
+exports.INT_VALIDATOR = INT_VALIDATOR;

package/validators/utils/number.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NUMBER_VALIDATOR = void 0;
+exports.validateNumber = validateNumber;
+
+function validateNumber(number) {
+  return !Number.isNaN(number);
+}
+
+var NUMBER_VALIDATOR = function NUMBER_VALIDATOR() {
+  return {
+    name: 'number-validator',
+    message: 'form.error.number',
+    test: function test(value) {
+      if (value === null) {
+        return true;
+      }
+
+      return validateNumber(value);
+    }
+  };
+};
+
+exports.NUMBER_VALIDATOR = NUMBER_VALIDATOR;