fix: skip validating null values

kenote · Nov 2, 2023 · d3982b1 · d3982b1
1 parent fdcc861
commit d3982b1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -106,8 +106,13 @@ function validateRule(rules, customize) {
             for (var rules_1 = __values(rules), rules_1_1 = rules_1.next(); !rules_1_1.done; rules_1_1 = rules_1.next()) {
                 var rule = rules_1_1.value;
                 var required = rule.required, message = rule.message, min = rule.min, max = rule.max, pattern = rule.pattern, validator = rule.validator, code = rule.code;
-                if (required && (lodash_1.isUndefined(value) || value === '')) {
-                    throw errorInfo(message, code || errorCode);
+                if (lodash_1.isUndefined(value) || value === '') {
+                    if (required) {
+                        throw errorInfo(message, code || errorCode);
+                    }
+                    else {
+                        break;
+                    }
                 }
                 if (lodash_1.isString(value)) {
                     if (min && checkLength(value) < min) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parse-string",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Parse the string into a Map.",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",

diff --git a/src/index.ts b/src/index.ts
@@ -70,8 +70,13 @@ function validateRule (rules: FilterData.rule[], customize?: Record<string, Func
   return (value: any, errorCode?: number) => {
     for (let rule of rules ) {
       let { required, message, min, max, pattern, validator, code } = rule
-      if (required && (isUndefined(value) || value === '')) {
-        throw errorInfo(message, code || errorCode)
+      if (isUndefined(value) || value === '') {
+        if (required) {
+          throw errorInfo(message, code || errorCode)
+        }
+        else {
+          break
+        }
       }
       if (isString(value)) {
         if (min && checkLength(value) < min) {