remove regex lib

Author: mfbx9da4

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "smtp"
+    ]
+}

package.json

@@ -41,23 +41,21 @@
   "dependencies": {
     "axios": "^0.19.2",
     "lodash": "^4.17.15",
-    "mailcheck": "^1.1.1",
-    "validator": "^12.2.0"
+    "mailcheck": "^1.1.1"
   },
   "devDependencies": {
-    "typescript": "^3.8.3",
     "@types/eslint": "^6.1.1",
     "@types/jest": "^24.0.23",
     "@types/lodash": "^4.14.141",
     "@types/mailcheck": "^1.1.31",
     "@types/node": "^12.7.8",
-    "@types/validator": "^12.0.1",
     "@typescript-eslint/eslint-plugin": "^2.3.1",
     "@typescript-eslint/parser": "^2.3.1",
     "eslint": "^6.4.0",
     "jest": "^24.9.0",
     "nodemon": "^1.19.2",
     "ts-jest": "^24.1.0",
-    "ts-node": "^8.4.1"
+    "ts-node": "^8.4.1",
+    "typescript": "^3.8.3"
   }
 }

src/index.ts

@@ -1,55 +1,22 @@
-import isEmail from 'validator/lib/isEmail'
-import { OutputFormat, createOutput } from './output/output'
+import { isEmail } from './regex/regex'
 import { checkTypo } from './typo/typo'
 import { getBestMx } from './dns/dns'
 import { checkSMTP } from './smtp/smtp'
 import { checkDisposable } from './disposable/disposable'
+import { getOptions, ValidatorOptions } from './options/options'
+import { OutputFormat, createOutput } from './output/output'
 import './types'
 
-const defaultOptions = {
-  email: '[email protected]',
-  sender: '[email protected]',
-  validateRegex: true,
-  validateMx: true,
-  validateTypo: true,
-  validateDisposable: true,
-  validateSMTP: true,
-}
-
-type ValidatorOptions = {
-  email: string
-  sender?: string
-  validateRegex?: boolean
-  validateMx?: boolean
-  validateTypo?: boolean
-  validateDisposable?: boolean
-  validateSMTP?: boolean
-}
-
-type ValidatorOptionsFinal = {
-  email: string
-  sender: string
-  validateRegex: boolean
-  validateMx: boolean
-  validateTypo: boolean
-  validateDisposable: boolean
-  validateSMTP: boolean
-}
-
 export async function validate(
   emailOrOptions: string | ValidatorOptions
 ): Promise<OutputFormat> {
-  let email: string
-  let options: ValidatorOptionsFinal = defaultOptions
-  if (typeof emailOrOptions === 'string') {
-    email = emailOrOptions
-  } else {
-    email = emailOrOptions.email
-    options = { ...options, ...emailOrOptions }
-  }
+  const options = getOptions(emailOrOptions)
+  const email = options.email
 
-  if (options.validateRegex && !isEmail(email))
-    return createOutput('regex', 'Invalid regex')
+  if (options.validateRegex) {
+    const regexResponse = isEmail(email)
+    if (regexResponse) return createOutput('regex', regexResponse)
+  }
 
   if (options.validateTypo) {
     const typoResponse = await checkTypo(email)

src/options/options.ts

@@ -0,0 +1,34 @@
+const defaultOptions: ValidatorOptionsFinal = {
+  email: '[email protected]',
+  sender: '[email protected]',
+  validateRegex: true,
+  validateMx: true,
+  validateTypo: true,
+  validateDisposable: true,
+  validateSMTP: true,
+}
+
+type Options = {
+  sender: string
+  validateRegex: boolean
+  validateMx: boolean
+  validateTypo: boolean
+  validateDisposable: boolean
+  validateSMTP: boolean
+}
+
+export type ValidatorOptions = Partial<Options> & { email: string }
+type ValidatorOptionsFinal = Options & { email: string }
+
+export function getOptions(
+  emailOrOptions: string | ValidatorOptions
+): ValidatorOptionsFinal {
+  let options: ValidatorOptionsFinal = defaultOptions
+
+  if (typeof emailOrOptions === 'string') {
+    options = { ...options, email: emailOrOptions }
+  } else {
+    options = { ...options, ...emailOrOptions }
+  }
+  return options
+}

src/regex/regex.ts

@@ -0,0 +1,15 @@
+export const isEmail = (email: string): string | undefined => {
+  email = (email || '').trim()
+  if (email.length === 0) {
+    return 'Email not provided'
+  }
+  const split = email.split('@')
+  if (split.length < 2) {
+    return 'Email does not contain "@".'
+  } else {
+    const [domain] = split.slice(-1)
+    if (domain.indexOf('.') === -1) {
+      return 'Must contain a "." after the "@".'
+    }
+  }
+}

test/__snapshots__/index.test.ts.snap

@@ -112,7 +112,7 @@ Object {
       "valid": false,
     },
     "regex": Object {
-      "reason": "Invalid regex",
+      "reason": "Email does not contain \\"@\\".",
       "valid": false,
     },
     "smtp": Object {

test/index.test.ts

@@ -6,7 +6,7 @@ const elevenSeconds = 11 * 1000
 
 describe('validation tests', () => {
   it('fails with bad regex', async () => {
-    const res = await validate('dav id@gmail.com')
+    const res = await validate('david.gmail.com')
     expect(res.valid).toBe(false)
     expect(res.reason).toBe('regex')
     expect(res.validators.regex?.valid).toBe(false)

yarn.lock

@@ -404,11 +404,6 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
-"@types/validator@^12.0.1":
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-12.0.1.tgz#73dbc7f5f730ff7131754bca682824eb3c260b79"
-  integrity sha512-l57fIANZLMe8DArz+SDb+7ATXnDm15P7u2wHBw5mb0aSMd+UuvmvhouBF2hdLgQPDMJ39sh9g2MJO4GkZ0VAdQ==
-
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
@@ -4197,11 +4192,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validator@^12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-12.2.0.tgz#660d47e96267033fd070096c3b1a6f2db4380a0a"
-  integrity sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==
-
 [email protected]:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"