fix output format

Author: mfbx9da4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deep-email-validator",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "files": [
     "dist/**/*"
   ],

src/index.ts

@@ -10,6 +10,7 @@ export async function validate(
   recipient: string,
   sender: string = '[email protected]'
 ): Promise<OutputFormat> {
+  console.log('recipient', recipient)
   if (!isEmail(recipient)) return createOutput('regex', 'Invalid regex')
 
   const typoResponse = await checkTypo(recipient)

src/output/output.ts

@@ -7,39 +7,31 @@ export type SubOutputFormat = {
   reason?: string
 }
 
-const NullOutputFormat: OutputFormat = {
-  valid: true,
-  validators: {
-    regex: { valid: true },
-    typo: { valid: true },
-    disposable: { valid: true },
-    mx: { valid: true },
-    smtp: { valid: true },
-  },
-}
 type Level = ElementType<typeof OrderedLevels>
 export type OutputFormat = SubOutputFormat & {
   validators: {
-    [K in Level]: SubOutputFormat
+    [K in Level]?: SubOutputFormat
   }
 }
 
 export const createOutput = (
   failLevel?: Level,
   failReason?: string
 ): OutputFormat => {
-  const out = NullOutputFormat
+  const out: OutputFormat = { valid: true, validators: {} }
+  if (failLevel) {
+    out.reason = failLevel
+    out.valid = false
+  }
   let valid = true
   for (let i = 0; i < OrderedLevels.length; i++) {
     const level = OrderedLevels[i]
-    let reason
+    const levelOut: SubOutputFormat = { valid }
     if (level === failLevel) {
       valid = false
-      out.valid = valid
-      reason = failReason
-      out.reason = failLevel
+      levelOut.reason = failReason
     }
-    out.validators[level] = { valid: valid, reason }
+    out.validators[level] = levelOut
   }
   return out
 }

src/smtp/smtp.ts

@@ -31,10 +31,10 @@ export const checkSMTP = async (
     })
 
     socket.on('success', () => {
-      r(createOutput())
       socket.write(`quit\r\n`)
       socket.end()
       socket.destroy()
+      r(createOutput())
     })
 
     const commands = [

test/__snapshots__/index.test.ts.snap

@@ -6,23 +6,19 @@ Object {
   "valid": false,
   "validators": Object {
     "disposable": Object {
-      "reason": undefined,
       "valid": true,
     },
     "mx": Object {
       "reason": "MX record not found",
-      "valid": false,
+      "valid": true,
     },
     "regex": Object {
-      "reason": undefined,
       "valid": true,
     },
     "smtp": Object {
-      "reason": undefined,
       "valid": false,
     },
     "typo": Object {
-      "reason": undefined,
       "valid": true,
     },
   },
@@ -35,23 +31,19 @@ Object {
   "valid": false,
   "validators": Object {
     "disposable": Object {
-      "reason": undefined,
       "valid": true,
     },
     "mx": Object {
-      "reason": undefined,
       "valid": true,
     },
     "regex": Object {
-      "reason": undefined,
       "valid": true,
     },
     "smtp": Object {
       "reason": "Invalid Mailbox",
-      "valid": false,
+      "valid": true,
     },
     "typo": Object {
-      "reason": undefined,
       "valid": true,
     },
   },
@@ -64,23 +56,19 @@ Object {
   "valid": false,
   "validators": Object {
     "disposable": Object {
-      "reason": undefined,
       "valid": false,
     },
     "mx": Object {
-      "reason": undefined,
       "valid": false,
     },
     "regex": Object {
       "reason": "Invalid regex",
-      "valid": false,
+      "valid": true,
     },
     "smtp": Object {
-      "reason": undefined,
       "valid": false,
     },
     "typo": Object {
-      "reason": undefined,
       "valid": false,
     },
   },
@@ -93,24 +81,20 @@ Object {
   "valid": false,
   "validators": Object {
     "disposable": Object {
-      "reason": undefined,
       "valid": false,
     },
     "mx": Object {
-      "reason": undefined,
       "valid": false,
     },
     "regex": Object {
-      "reason": undefined,
       "valid": true,
     },
     "smtp": Object {
-      "reason": undefined,
       "valid": false,
     },
     "typo": Object {
       "reason": "Likely typo, suggested email: [email protected]",
-      "valid": false,
+      "valid": true,
     },
   },
 }
@@ -123,22 +107,18 @@ Object {
   "validators": Object {
     "disposable": Object {
       "reason": "Email was created using a disposable email service",
-      "valid": false,
+      "valid": true,
     },
     "mx": Object {
-      "reason": undefined,
       "valid": false,
     },
     "regex": Object {
-      "reason": undefined,
       "valid": true,
     },
     "smtp": Object {
-      "reason": undefined,
       "valid": false,
     },
     "typo": Object {
-      "reason": undefined,
       "valid": true,
     },
   },
@@ -147,27 +127,21 @@ Object {
 
 exports[`validation tests passes 1`] = `
 Object {
-  "reason": "smtp",
-  "valid": false,
+  "valid": true,
   "validators": Object {
     "disposable": Object {
-      "reason": undefined,
       "valid": true,
     },
     "mx": Object {
-      "reason": undefined,
       "valid": true,
     },
     "regex": Object {
-      "reason": undefined,
       "valid": true,
     },
     "smtp": Object {
-      "reason": undefined,
       "valid": true,
     },
     "typo": Object {
-      "reason": undefined,
       "valid": true,
     },
   },

test/index.test.ts

@@ -27,7 +27,8 @@ describe('validation tests', () => {
   })
 
   it('passes', async () => {
-    const res = await validate('[email protected]')
+    const res = await validate('[email protected]')
+    console.log('res', res)
     expect(res).toMatchSnapshot()
   })
 })