Merge pull request #890 from chantouchsek/fix/889-return-types

Fix/889 return types

Author: chantouchsek

src/core/BaseService.ts

@@ -1,3 +1,4 @@
+import type { SimpleObject } from '../types'
 import type { AxiosError, AxiosInstance, Method, AxiosRequestConfig, AxiosResponse } from 'axios'
 import type { IParseOptions } from 'qs'
 import { isObject } from 'lodash'
@@ -23,7 +24,7 @@ export default class BaseService {
     ignoreQueryPrefix: true,
   }
 
-  constructor(readonly endpoint: string, public parameters: Record<string, any> = {}) {}
+  constructor(readonly endpoint: string, public parameters: SimpleObject<any> = {}) {}
 
   get $http() {
     return BaseService.$http
@@ -102,7 +103,7 @@ export default class BaseService {
           const { response } = error
           if (response && response.status === UNPROCESSABLE_ENTITY) {
             const { data } = response
-            const validationErrors: Record<string, any> = {}
+            const validationErrors: SimpleObject<any> = {}
             Object.assign(validationErrors, data[this.$errorProperty])
             this.onFail(validationErrors)
           }
@@ -131,7 +132,7 @@ export default class BaseService {
     return `${url}${query}`
   }
 
-  setParameters(parameters: Record<string, any>) {
+  setParameters(parameters: SimpleObject<any>) {
     Object.keys(parameters).forEach((key) => {
       this.parameters[key] = parameters[key]
     })
@@ -166,7 +167,7 @@ export default class BaseService {
     return this
   }
 
-  onFail(errors: Record<string, any>) {
+  onFail(errors: SimpleObject<any>) {
     this.errors.fill(errors)
     validator.fill(errors)
   }

src/core/Validator.ts

@@ -1,11 +1,12 @@
+import type { SimpleObject } from '../types'
 import { cloneDeep, get, has, omit } from 'lodash'
 import { is, toCamelCase, toSnakeCase } from '../util'
 
 class Validator {
   public successful: boolean
   public processing: boolean
 
-  constructor(public errors: Record<string, any> = {}) {
+  constructor(public errors: SimpleObject<any> = {}) {
     this.processing = false
     this.successful = false
   }
@@ -24,7 +25,7 @@ class Validator {
     return is(Object.keys(this.errors), fields)
   }
 
-  first(field: string | string[]): string | Record<string, any> | undefined {
+  first(field: string | string[]): string | undefined {
     if (Array.isArray(field)) {
       const fields = this.fields(field)
       let fd = ''
@@ -42,7 +43,7 @@ class Validator {
     }
   }
 
-  firstBy(obj: Record<string, any>, field?: string) {
+  firstBy(obj: SimpleObject<any>, field?: string) {
     let value: string
     if (!field) {
       value = obj[Object.keys(obj)[0]]
@@ -64,7 +65,7 @@ class Validator {
   any(field: string[] = [], returnObject?: boolean) {
     const fields = this.fields(field)
     if (returnObject) {
-      const errors: Record<string, any> = {}
+      const errors: SimpleObject<any> = {}
       if (!fields.length) return {}
       for (const f of fields) {
         const val = this.get(f)
@@ -74,7 +75,7 @@ class Validator {
       return errors
     }
     if (!fields.length) return Object.keys(this.errors).length > 0
-    const errors: Record<string, any> = {}
+    const errors: SimpleObject<any> = {}
     fields.forEach((key: string) => (errors[key] = this.get(key)))
     return Object.keys(errors).length > 0
   }
@@ -91,7 +92,7 @@ class Validator {
     return Object.keys(this.errors).length
   }
 
-  fill(errors: Record<string, any>) {
+  fill(errors: SimpleObject<any>) {
     this.errors = errors
   }
 

src/types.ts

@@ -0,0 +1 @@
+export type SimpleObject<V> = Record<string, V>