Merge pull request #452 from chantouchsek/fix/451-fix-on-clear-errors

Make the clear function onkeydown work correctly

Author: chantouchsek

package.json

@@ -12,7 +12,6 @@
     "watch": "tsc -w",
     "start": "nodemon",
     "release": "standard-version && git push --follow-tags origin main && yarn publish",
-    "prepublish": "yarn lint && yarn test && yarn build",
     "clean": "rimraf dist",
     "prepare": "husky install",
     "lint:js": "eslint --ext \".js,.ts\" --ignore-path .gitignore .",
@@ -52,8 +51,7 @@
     "@commitlint/config-conventional": "^17.0.0",
     "@nuxt/types": "^2.15.8",
     "@types/jest": "^27.4.0",
-    "@types/lodash.get": "^4.4.7",
-    "@types/lodash.has": "^4.5.7",
+    "@types/lodash": "^4.14.182",
     "@types/node": "^18.0.0",
     "@types/qs": "^6.9.7",
     "@typescript-eslint/eslint-plugin": "^5.9.0",
@@ -83,8 +81,7 @@
   ],
   "dependencies": {
     "axios": "^0.27.2",
-    "lodash.get": "^4.4.2",
-    "lodash.has": "^4.5.2",
+    "lodash": "^4.17.21",
     "qs": "^6.10.2"
   },
   "lint-staged": {

src/__tests__/base-service.test.ts

@@ -4,7 +4,7 @@ import MockAdapter from 'axios-mock-adapter'
 import PostService from '../util/PostService'
 import type { ValidatorType } from '../core/Validator'
 import Validator from '../core/Validator'
-import { merge } from '../util'
+import { merge } from 'lodash'
 
 let service: PostService
 let mockAdapter: MockAdapter

src/__tests__/object.test.ts

@@ -1,10 +1,4 @@
-import {
-  isFile,
-  cloneDeep,
-  hasOwnProperty,
-  merge,
-  isPlainObject,
-} from '../util'
+import { hasFiles, hasOwnProperty, isFile } from '../util'
 
 describe('Object Test', () => {
   // const { window, File } = global
@@ -16,61 +10,23 @@ describe('Object Test', () => {
     const file = new File(['hello world!'], 'myfile')
     expect(isFile(file)).toBeTruthy()
   })
-  /*
+  it('should check has own property', function () {
+    expect(hasOwnProperty({ dev: null }, '')).toBeFalsy()
+  })
   it('check if window is undefined', () => {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     delete global.window
     const file = new File(['hello world!'], 'myfile')
-    expect(isFile(file)).toBeFalsy()
+    const form = new FormData()
+    form.append('file', file)
+    expect(hasFiles(form)).toBeFalsy()
   })
+  /*
   it('check if File is not function', () => {
     const file = new File(['hello world!'], 'myfile')
     delete global.File
     expect(isFile(file)).toBeFalsy()
   })
   */
 })
-describe('cloneDeep', () => {
-  it('Object is null', () => {
-    expect(cloneDeep(null)).toBe(null)
-  })
-  it('Object is typeof File', () => {
-    const file = new File(['hello world!'], 'myfile')
-    expect(cloneDeep(file)).toBeInstanceOf(File)
-  })
-  it('Object is typeof Array', () => {
-    const obj = [{ name: 'Chantouch' }]
-    expect(cloneDeep(obj)).toBeInstanceOf(Object)
-  })
-  it('Has own property undefined', () => {
-    const obj = [{ name: 'Chantouch' }]
-    expect(hasOwnProperty(obj, undefined)).toBeFalsy()
-  })
-  it('Merge object into object', () => {
-    const obj1 = { name: 'Chantouch' }
-    const obj2 = { email: '[email protected]' }
-    const merged = { email: '[email protected]', name: 'Chantouch' }
-    expect(merge(obj1, obj2)).toEqual(merged)
-  })
-  it('should return `true` if the object is created by the `Object` constructor.', () => {
-    expect(isPlainObject(Object.create({}))).toBeTruthy()
-    expect(isPlainObject(Object.create(Object.prototype))).toBeTruthy()
-    expect(isPlainObject({ foo: 'bar' })).toBeTruthy()
-    expect(isPlainObject({})).toBeTruthy()
-    expect(isPlainObject(Object.create(null))).toBeTruthy()
-  })
-  it('should return `false` if the object is not created by the `Object` constructor.', () => {
-    function Foo(this: any) {
-      this.abc = {}
-    }
-    expect(isPlainObject(/foo/)).toBeFalsy()
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    expect(isPlainObject(function () {})).toBeFalsy()
-    expect(isPlainObject(1)).toBeFalsy()
-    expect(isPlainObject(['foo', 'bar'])).toBeFalsy()
-    expect(isPlainObject([])).toBeFalsy()
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    expect(isPlainObject(new Foo())).toBeFalsy()
-    expect(isPlainObject(null)).toBeFalsy()
-  })
-})

src/core/BaseService.ts

@@ -7,13 +7,8 @@ import type {
 } from 'axios'
 import type { Errors } from '..'
 import Validator from './Validator'
-import {
-  hasFiles,
-  objectToFormData,
-  removeDoubleSlash,
-  isObject,
-  isArray,
-} from '../util'
+import { hasFiles, objectToFormData, removeDoubleSlash } from '../util'
+import { isObject, isArray } from 'lodash'
 import qs, { IParseOptions } from 'qs'
 
 const validator = Validator

src/core/Validator.ts

@@ -1,6 +1,5 @@
+import { cloneDeep, get, has, omit, isArray } from 'lodash'
 import { is } from '../util'
-import get from 'lodash.get'
-import has from 'lodash.has'
 
 class Validator {
   public errors: Record<string, any>
@@ -23,7 +22,7 @@ class Validator {
   }
 
   has(field: string | string[]) {
-    if (Array.isArray(field)) {
+    if (isArray(field)) {
       return is(Object.keys(this.errors), field)
     }
     let hasError = has(this.errors, field)
@@ -110,28 +109,7 @@ class Validator {
     if (!attribute) {
       return this.flush()
     }
-    const errors = Object.assign({}, this.errors)
-    if (attribute instanceof Array) {
-      attribute.map((field: string) => {
-        Object.keys(errors)
-          .filter(
-            (e: string) =>
-              e === field ||
-              e.startsWith(`${field}.`) ||
-              e.startsWith(`${field}[`),
-          )
-          .forEach((e: string) => delete errors[e])
-      })
-    } else {
-      Object.keys(errors)
-        .filter(
-          (e: string) =>
-            e === attribute ||
-            e.startsWith(`${attribute}.`) ||
-            e.startsWith(`${attribute}[`),
-        )
-        .forEach((e: string) => delete errors[e])
-    }
+    const errors = omit(cloneDeep(this.errors), attribute)
     this.fill(errors)
   }
 
@@ -140,10 +118,10 @@ class Validator {
   }
 
   onKeydown(event: any, prefix?: string) {
-    const { name } = event.target
+    const { name } = event.target as HTMLInputElement
     if (!name) return
-    const nameWithPrefix = prefix ? `${prefix}.${name}` : null
-    this.clear([name, nameWithPrefix])
+    const names = prefix ? [name, `${prefix}.${name}`] : [name]
+    this.clear(names)
   }
 }
 

src/index.ts

@@ -1,7 +1,7 @@
 import type { ValidatorType } from './core/Validator'
 import BaseService from './core/BaseService'
 import Validator from './core/Validator'
-import { merge } from './util'
+import { merge } from 'lodash'
 import _Vue from 'vue'
 
 // augment typings of Vue.js

src/util/createDom.ts

@@ -5,7 +5,7 @@ export function disableTransitions() {
     transition: none !important;
     transition-timing-function: none !important;
   }`
-  const head = document.head || document.getElementsByTagName('head')[0]
+  const head = document.getElementsByTagName('head')[0]
   const style = document.createElement('style')
   head.appendChild(style)
   style.type = 'text/css'

src/util/objects.ts

@@ -18,69 +18,8 @@ export function isFile(object: any): boolean {
   return object instanceof File || object instanceof FileList
 }
 
-export function merge(a: any, b: any): Record<any, any> {
-  for (const key in b) {
-    if (hasOwnProperty(b, key)) {
-      a[key] = cloneDeep(b[key])
-    }
-  }
-  return a
-}
-
-export function cloneDeep(object: any): any {
-  if (object === null) {
-    return null
-  }
-
-  if (isFile(object)) {
-    return object
-  }
-
-  if (isArray(object)) {
-    const clone: any = []
-
-    for (const key in object) {
-      if (hasOwnProperty(object, key)) {
-        clone[key] = cloneDeep(object[key])
-      }
-    }
-
-    return clone
-  }
-
-  if (typeof object === 'object') {
-    const clone: any = {}
-
-    for (const key in object) {
-      if (hasOwnProperty(object, key)) {
-        clone[key] = cloneDeep(object[key])
-      }
-    }
-
-    return clone
-  }
-
-  return object
-}
-
 export function is(errors: any, error: any): boolean {
   return isArray(error)
     ? error.some((w: string) => is(errors, w))
     : errors.includes(error)
 }
-
-export function isObject(value: any) {
-  return Object.prototype.toString.call(value) === '[object Object]'
-}
-
-export function isPlainObject(value: any) {
-  if (!isObject(value)) return false
-
-  const ctor = value.constructor
-  if (ctor === undefined) return true
-
-  const prot = ctor.prototype
-  if (!isObject(prot)) return false
-
-  return hasOwnProperty(prot, 'isPrototypeOf')
-}

tsconfig.json

@@ -24,8 +24,7 @@
       "axios",
       "axios-mock-adapter",
       "@types/qs",
-      "@types/lodash.get",
-      "@types/lodash.has"
+      "@types/lodash"
     ]
   },
   "include": ["src"],

yarn.lock

@@ -2393,21 +2393,7 @@
   resolved "https://registry.yarnpkg.com/@types/less/-/less-3.0.2.tgz#2761d477678c8374cb9897666871662eb1d1115e"
   integrity sha512-62vfe65cMSzYaWmpmhqCMMNl0khen89w57mByPi1OseGfcV/LV03fO8YVrNj7rFQsRWNJo650WWyh6m7p8vZmA==
 
-"@types/lodash.get@^4.4.7":
-  version "4.4.7"
-  resolved "https://registry.yarnpkg.com/@types/lodash.get/-/lodash.get-4.4.7.tgz#1ea63d8b94709f6bc9e231f252b31440abe312cf"
-  integrity sha512-af34Mj+KdDeuzsJBxc/XeTtOx0SZHZNLd+hdrn+PcKGQs0EG2TJTzQAOTCZTgDJCArahlCzLWSy8c2w59JRz7Q==
-  dependencies:
-    "@types/lodash" "*"
-
-"@types/lodash.has@^4.5.7":
-  version "4.5.7"
-  resolved "https://registry.yarnpkg.com/@types/lodash.has/-/lodash.has-4.5.7.tgz#9e1c3da3ee67f68fadc3d168ffdf8e11a3f3ccd3"
-  integrity sha512-nfbAzRbsZBdzSAkL9iiLy4SQk89uuFcXBFwZ7pf6oZhBgPvNys8BY5Twp/w8XvZKGt1o6cAa85wX4QhqO3uQ7A==
-  dependencies:
-    "@types/lodash" "*"
-
-"@types/lodash@*":
+"@types/lodash@^4.14.182":
   version "4.14.182"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
   integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
@@ -7820,16 +7806,6 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
-
-lodash.has@^4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
-  integrity sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g==
-
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"