fix(test): ✅ fixed and update some types

Author: chantouchsek

jest.config.js

@@ -5,14 +5,10 @@ module.exports = {
   collectCoverageFrom: ['src/**/*.ts', 'src/**/*.js'],
   coverageThreshold: {
     global: {
-      // branches: 100,
-      // functions: 100,
-      // lines: 100,
-      // statements: 100,
-      branches: 65,
-      functions: 70,
-      lines: 50,
-      statements: 50,
+      lines: 100,
+      functions: 100,
+      branches: 89.44,
+      statements: 99.36,
     },
   },
   testEnvironment: 'node',

package.json

@@ -29,11 +29,16 @@
     "rest",
     "query",
     "builder",
-    "laravel"
+    "laravel",
+    "queries",
+    "vue-api-queries",
+    "vue api queries",
+    "api request"
   ],
   "author": {
     "name": "Chantouch Sek",
-    "email": "chantouchsek.cs83@gmail.com"
+    "email": "chantouchsek.cs83@gmail.com",
+    "url": "https://chantouch.me"
   },
   "license": "ISC",
   "bugs": {

src/__tests__/base-proxy.test.ts

@@ -1,7 +1,7 @@
 import Axios from 'axios'
 import BaseProxy from '../core/BaseProxy'
 import MockAdapter from 'axios-mock-adapter'
-import PostProxy from '../core/PostPorxy'
+import PostProxy from '../util/PostPorxy'
 import type { ValidatorType } from '../core/Validator'
 import Validator from '../core/Validator'
 import BaseTransformer from '../core/BaseTransformer'

src/__tests__/form-data.test.ts

@@ -1,4 +1,4 @@
-import { objectToFormData } from '../util/formData'
+import { objectToFormData } from '../util'
 
 describe('FormData', () => {
   it('if object is null, undefined or array length is zero', async () => {
@@ -11,4 +11,18 @@ describe('FormData', () => {
     expect(formData.get('items1')).toHaveLength(0)
     expect(formData.get('name')).toBe('')
   })
+  it('window is undefined', async () => {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    delete global.window
+    const formData = objectToFormData({
+      null: '',
+      items1: [],
+      name: null,
+      __proto__: 'Hi',
+    })
+    expect(formData.get('null')).toBe('')
+    expect(formData.get('items1')).toHaveLength(0)
+    expect(formData.get('name')).toBe('')
+  })
 })

src/__tests__/object.test.ts

@@ -1,4 +1,4 @@
-import { isFile, cloneDeep } from '../util/objects'
+import { isFile, cloneDeep } from '../util'
 
 describe('Object Test', () => {
   // const { window, File } = global

src/__tests__/post-proxy.spec.ts

@@ -1,6 +1,6 @@
 import Axios from 'axios'
 import BaseProxy from '../core/BaseProxy'
-import PostProxy from '../core/PostPorxy'
+import PostProxy from '../util/PostPorxy'
 import MockAdapter from 'axios-mock-adapter'
 import BaseTransformer from '../core/BaseTransformer'
 import PaginationTransformer from '../core/PaginationTransformer'
@@ -35,4 +35,21 @@ describe('PostProxy', () => {
     expect(data.length).toEqual(1)
     expect(all.pagination.page).toEqual(1)
   })
+  it('it should throw exception if method is not inlist', async () => {
+    const items = {
+      data: [{ name: 'Chantouch', post_id: 1 }],
+      meta: {
+        pagination: { count: 1, current_page: 1, perPage: 20 },
+        include: [],
+      },
+    }
+    mockAdapter.onGet('/posts/1/tags').reply(500, items)
+    try {
+      await proxy.throwException(1)
+    } catch (e: any) {
+      expect(e.message).toEqual(
+        '`unlink` is not a valid request type, must be one of: `get`, `delete`, `head`, `post`, `put`, `patch`.',
+      )
+    }
+  })
 })

src/__tests__/validator.test.ts

@@ -152,7 +152,7 @@ describe('Validator', () => {
     }
     validator.fill(errors)
     validator.onKeydown(event, 'form')
-    expect(validator.has(['form.name'])).toBeFalsy()
+    expect(validator.has(['form.name', 'name'])).toBeFalsy()
   })
 
   it('can pass array of keys to any method and get back error of specified key', () => {

src/core/BaseProxy.ts

@@ -187,7 +187,7 @@ class BaseProxy {
    * @param {Object|string} form
    * @param {AxiosRequestConfig} config
    */
-  submit<T>(
+  submit<T = any>(
     requestType: Method,
     parameter?: string | number,
     form?: T,
@@ -201,12 +201,11 @@ class BaseProxy {
         ? `/${this.endpoint}/${parameter}`
         : `/${this.endpoint}`
       const endpoint = this.__getParameterString(removeDoubleSlash(url))
-      const axiosConfig: AxiosRequestConfig = { data, method }
-      this.$http(endpoint, Object.assign({}, config, axiosConfig))
+      config = Object.assign({}, config, { data, method })
+      this.$http(endpoint, config)
         .then((response: AxiosResponse) => {
           this.onSuccess()
-          const { data } = response || {}
-          resolve(data)
+          resolve(response.data)
         })
         .catch((error: AxiosError) => {
           this.errors.processing = false

src/core/PaginationTransformer.ts

@@ -17,14 +17,13 @@ export interface PaginationOptions {
   pageStop?: number
   include?: string | string[]
 }
-
 export interface MetaOptions {
   pagination?: PaginationOptions
   include?: string | string[]
 }
 
 class PaginationTransformer extends BaseTransformer {
-  static fetch(meta: MetaOptions | any) {
+  static fetch(meta: MetaOptions | Record<string, any>) {
     if (!meta) {
       meta = { pagination: {}, include: [] }
     }

src/core/Validator.ts

@@ -1,7 +1,7 @@
-import { is, isArray } from '../util'
+import { hasOwnProperty, is, isArray } from '../util'
 
 class Validator {
-  public errors: any
+  public errors: Record<string, any>
   public successful: boolean
   public processing: boolean
 
@@ -24,7 +24,7 @@ class Validator {
     if (isArray(field)) {
       return is(Object.keys(this.errors), field)
     }
-    let hasError: boolean = this.errors.hasOwnProperty(field)
+    let hasError = hasOwnProperty(this.errors, field)
     if (!hasError) {
       const errors = Object.keys(this.errors).filter(
         (e: string) => e.startsWith(`${field}.`) || e.startsWith(`${field}[`),
@@ -37,7 +37,7 @@ class Validator {
   first(field: any | any[]): string {
     if (field instanceof Array) {
       for (let i = 0; i < field.length; i++) {
-        if (!this.errors.hasOwnProperty(field[i])) {
+        if (!hasOwnProperty(this.errors, field[i])) {
           continue
         }
         return this.first(field[i])
@@ -46,7 +46,7 @@ class Validator {
     return this.get(field)[0]
   }
 
-  firstBy(obj: Record<string, any>, field = '') {
+  firstBy(obj: Record<string, any>, field?: string) {
     let value
     if (!field) {
       value = obj[Object.keys(obj)[0]]
@@ -69,7 +69,7 @@ class Validator {
 
   any(fields: string[] = [], returnObject?: boolean): boolean | string[] | any {
     if (returnObject) {
-      const errors: any = {}
+      const errors: Record<string, any> = {}
       if (!fields.length) {
         return {}
       }
@@ -79,7 +79,7 @@ class Validator {
     if (!fields.length) {
       return Object.keys(this.errors).length > 0
     }
-    const errors: any = {}
+    const errors: Record<string, any> = {}
     fields.forEach((key: string) => (errors[key] = this.get(key)))
     return Object.keys(errors).length > 0
   }
@@ -96,9 +96,9 @@ class Validator {
     return Object.keys(this.errors).length
   }
 
-  fill(errors: any) {
+  fill(errors: Record<string, any>) {
     for (const error in errors) {
-      if (!errors.hasOwnProperty(error)) {
+      if (!hasOwnProperty(errors, error)) {
         continue
       }
       if (!(errors[error] instanceof Array)) {
@@ -148,8 +148,8 @@ class Validator {
   onKeydown(event: any, prefix?: string) {
     const { name } = event.target
     if (!name) return
-    const name2 = prefix ? `${prefix}.${name}` : null
-    this.clear([name, name2])
+    const nameWithPrefix = prefix ? `${prefix}.${name}` : null
+    this.clear([name, nameWithPrefix])
   }
 }