Merge branch 'upgrage-devs' of github.com:plumier/typedconverter into…

… upgrage-devs
ktutnik · Nov 1, 2019 · 0854b61 · 0854b61
2 parents 8acb92d + 86fb8a1
commit 0854b61
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/src/converter.ts b/src/converter.ts
@@ -35,8 +35,10 @@ function booleanConverter(rawValue: {}) {
 
 function numberConverter(rawValue: {}) {
     const value = safeToString(rawValue)
+    if (value === "") return
     const result = Number(value)
-    return isNaN(result) ? undefined : result
+    if (isNaN(result)) return
+    return result
 }
 
 function dateConverter(rawValue: {}) {

diff --git a/src/validation.ts b/src/validation.ts
@@ -39,7 +39,7 @@ function isPartial(i: VisitorInvocation) {
 }
 
 function isEmpty(result: Result) {
-    return (result.value === undefined || result.value === null) && result.issues === undefined
+    return (result.value === "" || result.value === undefined || result.value === null) && result.issues === undefined
 }
 
 // --------------------------------------------------------------------- //

diff --git a/test/__snapshots__/validation.spec.ts.snap b/test/__snapshots__/validation.spec.ts.snap
@@ -350,6 +350,24 @@ Object {
 }
 `;
 
+exports[`Optional & Partial Validation Object Validator Should validate empty string property 1`] = `
+Object {
+  "issues": Array [
+    Object {
+      "messages": Array [
+        "Required",
+      ],
+      "path": "name",
+    },
+  ],
+  "value": AnimalClass {
+    "birthday": 2018-02-02,
+    "deceased": true,
+    "id": 200,
+  },
+}
+`;
+
 exports[`Optional & Partial Validation Object Validator Should validate null property 1`] = `
 Object {
   "issues": Array [

diff --git a/test/number-converter.spec.ts b/test/number-converter.spec.ts
@@ -28,6 +28,10 @@ describe("Number Converter", () => {
         const result = convert(undefined)
         expect(result.value).toBeUndefined()
     })
+    it("Should return undefined if provided empty string", () => {
+        const result = convert("")
+        expect(result.value).toBeUndefined()
+    })
     it("Should not convert string", () => {
         const result = convert("Hello")
         expect(result.issues).toEqual([{ path: "", messages: [`Unable to convert "Hello" into Number`] }])

diff --git a/test/validation.spec.ts b/test/validation.spec.ts
@@ -102,6 +102,11 @@ describe("Optional & Partial Validation", () => {
             expect(result).toMatchSnapshot()
         })
 
+        it("Should validate empty string property", () => {
+            const result = convert({ id: "200", name: "", deceased: "ON", birthday: "2018-2-2" }, { ...option })
+            expect(result).toMatchSnapshot()
+        })
+
         it("Should valid if provided null optional", () => {
             const result = convert({ id: "123", name: "Mimi", deceased: "ON", birthday: null }, { ...option })
             expect(result).toMatchSnapshot()