chore: 🚚 :fixed can't over default errorproperty message key and some minor bug fixes

Author: chantouchsek

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-api-queries",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Elegant and simple way to build requests for REST API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -75,7 +75,6 @@
   ],
   "dependencies": {
     "camelcase-keys": "^7.0.0",
-    "lodash.merge": "^4.6.2",
     "qs": "^6.10.1",
     "snakecase-keys": "^5.0.0"
   }

src/__tests__/base-proxy.test.ts

@@ -17,6 +17,7 @@ describe('BaseProxy', () => {
     validator = Validator
     const axios = Axios.create({ baseURL: 'https://mock-api.test' })
     BaseProxy.$http = axios
+    BaseProxy.$errorProperty = 'message'
     proxy = new PostProxy()
     mockAdapter = new MockAdapter(axios)
     mockAdapter.reset()
@@ -304,7 +305,7 @@ describe('BaseProxy', () => {
   it('it should throw errors message when data is not valid', async () => {
     const item = { first_name: null, last_name: 'Sek', id: 1 }
     mockAdapter.onPost('/posts').replyOnce(422, {
-      errors: { first_name: ['The first name field is required'] },
+      message: { first_name: 'The first name field is required' },
     })
     try {
       await proxy.post(item)

src/__tests__/package.spec.ts

@@ -7,7 +7,7 @@ describe('Vue Api Queries', () => {
   disableTransitions()
   addElemWithDataAppToBody()
   Vue.use(VueApiQueries, {
-    errorProperty: 'errors',
+    errorProperty: 'message',
   })
 
   test('Get plugin installed', async () => {

src/index.ts

@@ -3,7 +3,8 @@ import BaseProxy from './core/BaseProxy'
 import Validator from './core/Validator'
 import BaseTransformer from './core/BaseTransformer'
 import PaginationTransformer from './core/PaginationTransformer'
-import merge from 'lodash.merge'
+import { merge } from './util'
+import _Vue from 'vue'
 
 // augment typings of Vue.js
 import './vue'
@@ -13,29 +14,35 @@ export type { ValidatorType }
 
 class VueApiQueries {
   installed = false
-  install(Vue: any, options: any = {}) {
+  parsedQs = {
+    comma: true,
+    allowDots: true,
+    ignoreQueryPrefix: true,
+  }
+  install(Vue: typeof _Vue, options: any = {}) {
     if (this.installed) return
     this.installed = true
-    const defaultOption = merge(options, {
-      parsedQs: {
-        comma: true,
-        allowDots: true,
-        ignoreQueryPrefix: true,
+    const defaultOption = merge(
+      {
+        parsedQs: this.parsedQs,
+        errorProperty: 'errors',
       },
-      errorProperty: 'errors',
-    })
+      options,
+    )
     const { axios, errorProperty, parsedQs } = defaultOption
     BaseProxy.$http = axios
     BaseProxy.$errorProperty = errorProperty || 'errors'
-    BaseProxy.$parsedQs = parsedQs
+    BaseProxy.$parsedQs = parsedQs || this.parsedQs
     Vue.mixin({
       beforeCreate() {
-        this.$options.$errors = {}
-        Vue.util.defineReactive(this.$options, '$errors', Validator)
+        this.$options.$errors = {} as any
+        Vue.set(this.$options, '$errors', Validator)
         if (!this.$options.computed) {
           this.$options.computed = {}
         }
         this.$options.computed.$errors = function () {
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
           return this.$options.$errors
         }
       },

src/util/objects.ts

@@ -2,6 +2,11 @@ export function isArray(object: any): boolean {
   return Object.prototype.toString.call(object) === '[object Array]'
 }
 
+export function hasOwnProperty(obj: any, key: any) {
+  if (!obj || !key) return false
+  return Object.prototype.hasOwnProperty.call(obj, key)
+}
+
 export function isFile(object: any): boolean {
   if (typeof window === 'undefined') {
     return false
@@ -12,9 +17,9 @@ export function isFile(object: any): boolean {
   return object instanceof File || object instanceof FileList
 }
 
-export function merge(a: any, b: any): string[] {
+export function merge(a: any, b: any): Record<any, any> {
   for (const key in b) {
-    if (Object.prototype.hasOwnProperty.call(b, key)) {
+    if (hasOwnProperty(b, key)) {
       a[key] = cloneDeep(b[key])
     }
   }
@@ -34,7 +39,7 @@ export function cloneDeep(object: any): any {
     const clone: any = []
 
     for (const key in object) {
-      if (Object.prototype.hasOwnProperty.call(object, key)) {
+      if (hasOwnProperty(object, key)) {
         clone[key] = cloneDeep(object[key])
       }
     }
@@ -46,7 +51,7 @@ export function cloneDeep(object: any): any {
     const clone: any = {}
 
     for (const key in object) {
-      if (Object.prototype.hasOwnProperty.call(object, key)) {
+      if (hasOwnProperty(object, key)) {
         clone[key] = cloneDeep(object[key])
       }
     }

src/util/promise.ts

@@ -1,5 +1,3 @@
 export function sleep(ms: number) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms)
-  })
+  return new Promise((resolve) => setTimeout(resolve, ms))
 }

src/vue.ts

@@ -17,6 +17,6 @@ declare module 'vue/types/vue' {
 declare module 'vue/types/options' {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   interface ComponentOptions<V extends _Vue> {
-    errors?: ValidatorType
+    $errors?: ValidatorType
   }
 }