Making valid length validator pass for no value (#35)

NewOrbit · Jun 7, 2019 · a4921e5 · a4921e5
1 parent 0c9b3a0
commit a4921e5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/validators/valid-length.ts b/src/validators/valid-length.ts
@@ -32,7 +32,8 @@ export const validLength = (options: ValidLengthOptions) => {
     }
 
     return createValidator<string>(s =>
-        (options.min === undefined || s.length >= options.min) && (options.max === undefined || s.length <= options.max)
+        !s
+        || ((options.min === undefined || s.length >= options.min) && (options.max === undefined || s.length <= options.max))
         , getMessage(options)
     );
 };
diff --git a/test/validators/valid-length.test.ts b/test/validators/valid-length.test.ts
@@ -5,6 +5,23 @@ import { validLength } from "../../src/validators/valid-length";
 @TestFixture("ValidLength")
 export class ValidLengthTests {
 
+    @TestCase(null)
+    @TestCase(undefined)
+    @TestCase("")
+    @Test("should pass for null, undefined or empty")
+    public shouldPassForNullUndefinedOrEmpty(value: string) {
+        const message = "Invalid length";
+
+        const validator = validLength({
+            min: 3,
+            max: 5,
+            message
+        });
+
+        const results = validator(value);
+        Expect(results).toBeAPass();
+    }
+
     @TestCase(2, 10, "12345")
     @TestCase(5, undefined, "12345")
     @TestCase(undefined, 6, "123")