test: 🔥 test more file

Author: TouchSek

package.json

@@ -66,6 +66,7 @@
     "eslint-config-prettier": "^6.13.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-promise": "^4.3.1",
     "husky": "^4.3.0",
     "jest": "^26.5.3",
     "nodemon": "^2.0.5",
@@ -84,7 +85,6 @@
   "dependencies": {
     "axios": "^0.21.1",
     "camelcase-keys": "^6.2.2",
-    "escape-string-regexp": "^4.0.0",
     "lodash.merge": "^4.6.2",
     "qs": "^6.9.6",
     "snakecase-keys": "^3.2.0"

src/__tests__/base-proxy.test.ts

@@ -15,7 +15,7 @@ let validator: ValidatorType
 describe('BaseProxy', () => {
   beforeEach(() => {
     validator = Validator
-    const axios = Axios.create({ baseURL: 'http://mock-api.test' })
+    const axios = Axios.create({ baseURL: 'https://mock-api.test' })
     BaseProxy.$http = axios
     proxy = new PostProxy()
     mockAdapter = new MockAdapter(axios)
@@ -333,8 +333,8 @@ describe('BaseProxy', () => {
   })
 
   it('can accept a custom http instance in options', () => {
-    BaseProxy.$http = Axios.create({ baseURL: 'http://another-example.com' })
-    expect(proxy.$http.defaults.baseURL).toBe('http://another-example.com')
+    BaseProxy.$http = Axios.create({ baseURL: 'https://another-example.com' })
+    expect(proxy.$http.defaults.baseURL).toBe('https://another-example.com')
 
     BaseProxy.$http = Axios.create()
     expect(proxy.$http.defaults.baseURL).toBe(undefined)

src/__tests__/form-data.test.ts

@@ -0,0 +1,14 @@
+import { objectToFormData } from '../util/formData'
+
+describe('FormData', () => {
+  it('if object is null, undefined or array length is zero', async () => {
+    const formData = objectToFormData({
+      null: '',
+      items1: [],
+      name: null,
+    })
+    expect(formData.get('null')).toBe('')
+    expect(formData.get('items1')).toHaveLength(0)
+    expect(formData.get('name')).toBe('')
+  })
+})

src/__tests__/object.test.ts

@@ -0,0 +1,36 @@
+import { isFile, cloneDeep } from '../util/objects'
+
+describe('Object Test', () => {
+  const { window, File } = global
+  afterEach(() => {
+    global.window = window
+    global.File = File
+  })
+  it('check if object is a file Instance', () => {
+    const file = new File(['hello world!'], 'myfile')
+    expect(isFile(file)).toBeTruthy()
+  })
+  it('check if window is undefined', () => {
+    delete global.window
+    const file = new File(['hello world!'], 'myfile')
+    expect(isFile(file)).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)
+  })
+})

src/core/BaseProxy.ts

@@ -70,7 +70,7 @@ class BaseProxy {
   }
 
   submit(requestType: Method, url: string, form?: any): Promise<any> {
-    this.__validateRequestType(requestType)
+    BaseProxy.__validateRequestType(requestType)
     this.beforeSubmit()
     return new Promise((resolve, reject) => {
       const data = this.__hasFiles(form) ? objectToFormData(form) : form
@@ -100,12 +100,16 @@ class BaseProxy {
     })
   }
 
-  __getParameterString(url: string): string {
-    const query = qs.stringify(this.parameters, { encode: false })
-    return query ? `${url}?${query}` : url
+  private __getParameterString(url: string): string {
+    const query = qs.stringify(this.parameters, {
+      encode: false,
+      skipNulls: true,
+      addQueryPrefix: true,
+    })
+    return `${url}${query}`
   }
 
-  __validateRequestType(requestType: Method): void {
+  private static __validateRequestType(requestType: Method): void {
     const requestTypes: Array<string> = [
       'get',
       'delete',
@@ -122,7 +126,7 @@ class BaseProxy {
     }
   }
 
-  __hasFiles(form: any): boolean {
+  private __hasFiles(form: any): boolean {
     for (const property in form) {
       if (!form.hasOwnProperty(property)) {
         return false
@@ -137,7 +141,7 @@ class BaseProxy {
     return false
   }
 
-  __hasFilesDeep(object: any): boolean {
+  private __hasFilesDeep(object: any): boolean {
     if (object === null) {
       return false
     }

src/core/PaginationTransformer.ts

@@ -2,18 +2,20 @@ import BaseTransformer from './BaseTransformer'
 import snakecaseKeys from 'snakecase-keys'
 
 export interface PaginationOptions {
-  per_page?: string | number
-  total_pages?: string | number
-  current_page?: string | number
-  total?: string | number
+  perPage: number
+  totalPages: number
+  totalCount: number
+  limit: number
+  currentPage: number
+  total: number
   links?: string | number
-  count?: string | number
-  page?: string | number
-  items_per_page?: string | number
-  page_count?: string | number
-  items_length?: string | number
-  page_start?: string | number
-  page_stop?: string | number
+  count: number
+  page: number
+  itemsPerPage?: number
+  pageCount: number
+  itemsLength: number
+  pageStart?: number
+  pageStop?: number
   include?: string | string[]
 }
 
@@ -24,7 +26,7 @@ export interface MetaOptions {
 
 class PaginationTransformer extends BaseTransformer {
   static fetch(meta: MetaOptions | any) {
-    if (!meta.hasOwnProperty('pagination')) {
+    if (!Object.prototype.hasOwnProperty.call(meta, 'pagination')) {
       return snakecaseKeys(meta, { deep: true })
     }
     const { pagination = {}, include } = meta

src/util/formData.ts

@@ -2,15 +2,15 @@ export function objectToFormData(
   object,
   formData = new FormData(),
   parent = null,
-): FormData | void {
+): FormData {
   if (object === null || object === 'undefined' || object.length === 0) {
-    return formData.append(parent, object)
-  }
-  for (const property in object) {
-    if (!object.hasOwnProperty(property)) {
-      continue
+    formData.append(parent, object)
+  } else {
+    for (const property in object) {
+      if (Object.hasOwnProperty.call(object, property)) {
+        appendToFormData(formData, getKey(parent, property), object[property])
+      }
     }
-    appendToFormData(formData, getKey(parent, property), object[property])
   }
   return formData
 }

src/util/matcher.ts

@@ -1,5 +1,3 @@
-import { isMatch } from './matcher'
-
 export function isArray(object: any): boolean {
   return Object.prototype.toString.call(object) === '[object Array]'
 }
@@ -16,10 +14,9 @@ export function isFile(object: any): boolean {
 
 export function merge(a: any, b: any): string[] {
   for (const key in b) {
-    if (!b.hasOwnProperty(key)) {
-      continue
+    if (Object.prototype.hasOwnProperty.call(b, key)) {
+      a[key] = cloneDeep(b[key])
     }
-    a[key] = cloneDeep(b[key])
   }
   return a
 }
@@ -37,7 +34,7 @@ export function cloneDeep(object: any): any {
     const clone: string[] = []
 
     for (const key in object) {
-      if (object.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(object, key)) {
         clone[key] = cloneDeep(object[key])
       }
     }
@@ -49,7 +46,7 @@ export function cloneDeep(object: any): any {
     const clone = {}
 
     for (const key in object) {
-      if (object.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(object, key)) {
         clone[key] = cloneDeep(object[key])
       }
     }
@@ -61,9 +58,6 @@ export function cloneDeep(object: any): any {
 }
 
 export function is(errors: any, error: any): boolean {
-  if (typeof error === 'string' && error.match(/[\*\!]/)) {
-    return errors.filter((w: any) => isMatch(w, error)).length > 0
-  }
   return isArray(error)
     ? error.some((w) => is(errors, w))
     : errors.includes(error)

src/util/objects.ts

@@ -12,7 +12,8 @@
       "@types/node",
       "@nuxt/types",
       "@types/jest",
-      "axios"
+      "axios",
+      "axios-mock-adapter"
     ]
   },
   "include": ["src"],