test: ✅ update test

Author: chantouchsek

jest.config.js

@@ -7,8 +7,8 @@ module.exports = {
     global: {
       lines: 100,
       functions: 100,
-      branches: 89.44,
-      statements: 99.36,
+      branches: 91.25,
+      statements: 99.68,
     },
   },
   testEnvironment: 'node',

package.json

@@ -50,7 +50,6 @@
     "@nuxt/types": "^2.15.8",
     "@types/escape-string-regexp": "^2.0.1",
     "@types/jest": "^27.0.1",
-    "@types/lodash.merge": "^4.6.6",
     "@types/node": "^16.9.3",
     "@types/qs": "^6.9.7",
     "@typescript-eslint/eslint-plugin": "^4.31.1",

src/__tests__/object.test.ts

@@ -1,4 +1,4 @@
-import { isFile, cloneDeep } from '../util'
+import { isFile, cloneDeep, hasOwnProperty, merge } from '../util'
 
 describe('Object Test', () => {
   // const { window, File } = global
@@ -35,4 +35,14 @@ describe('cloneDeep', () => {
     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)
+  })
 })

src/core/BaseProxy.ts

@@ -9,7 +9,6 @@ import type { Errors } from '..'
 import Validator from './Validator'
 import { hasFiles, objectToFormData, removeDoubleSlash } from '../util'
 import qs, { IParseOptions } from 'qs'
-import merge from 'lodash.merge'
 
 const validator = Validator
 const UNPROCESSABLE_ENTITY = 422
@@ -232,14 +231,7 @@ class BaseProxy {
   }
 
   private static __validateRequestType(requestType: Method): Method {
-    const requestTypes: string[] = [
-      'get',
-      'delete',
-      'head',
-      'post',
-      'put',
-      'patch',
-    ]
+    const requestTypes = ['get', 'delete', 'head', 'post', 'put', 'patch']
     if (!requestTypes.includes(requestType)) {
       throw new Error(
         `\`${requestType}\` is not a valid request type, ` +
@@ -267,7 +259,7 @@ class BaseProxy {
    */
   setParameter(parameter: string, value?: any): this {
     if (!value) {
-      const options: IParseOptions = merge(this.$parsedQs, {
+      const options: IParseOptions = Object.assign({}, this.$parsedQs, {
         comma: true,
         allowDots: true,
         ignoreQueryPrefix: true,

src/core/BaseTransformer.ts

@@ -2,25 +2,25 @@ import snakeCaseKeys from 'snakecase-keys'
 import camelcaseKeys from 'camelcase-keys'
 
 class BaseTransformer {
-  static fetchCollection<T>(
+  static fetchCollection<T = any>(
     items: T[],
     camelKey?: boolean,
   ): (Record<string, any> | T)[] {
     return items.map((item: T) => this.fetch(item, camelKey))
   }
 
-  static sendCollection<T>(
+  static sendCollection<T = any>(
     items: T[],
     snakeKey?: boolean,
   ): ({ [p: string]: any } | T)[] {
     return items.map((item: T) => this.send(item, snakeKey))
   }
 
-  static fetch<T>(item: T, camelKey?: boolean): T | Record<string, any> {
+  static fetch<T = any>(item: T, camelKey?: boolean): T | Record<string, any> {
     return camelKey ? camelcaseKeys(item, { deep: true }) : item
   }
 
-  static send<T>(item: T, snakeKey?: boolean) {
+  static send<T = any>(item: T, snakeKey?: boolean) {
     return snakeKey ? snakeCaseKeys(item) : item
   }
 }

src/core/PaginationTransformer.ts

@@ -1,4 +1,5 @@
 import BaseTransformer from './BaseTransformer'
+import { hasOwnProperty } from '../util'
 
 export interface PaginationOptions {
   perPage: number
@@ -25,14 +26,13 @@ export interface MetaOptions {
 class PaginationTransformer extends BaseTransformer {
   static fetch(meta: MetaOptions | Record<string, any>) {
     if (!meta) {
-      meta = { pagination: {}, include: [] }
+      meta = Object.assign({}, meta, { pagination: {}, include: [] })
     }
-    if (!Object.prototype.hasOwnProperty.call(meta, 'pagination')) {
+    if (!hasOwnProperty(meta, 'pagination')) {
       return super.fetch(meta, true)
     }
-    const { pagination = {}, include } = meta
-    const payload = {
-      ...pagination,
+    const { pagination, include } = meta
+    const payload: PaginationOptions = Object.assign({}, pagination, {
       perPage: pagination.per_page,
       totalPages: pagination.total_pages,
       currentPage: pagination.current_page || 1,
@@ -46,7 +46,7 @@ class PaginationTransformer extends BaseTransformer {
       pageStart: 0,
       pageStop: pagination.count,
       include,
-    }
+    })
 
     return super.fetch(payload, true)
   }

yarn.lock

@@ -1942,18 +1942,6 @@
   resolved "https://registry.yarnpkg.com/@types/less/-/less-3.0.2.tgz#2761d477678c8374cb9897666871662eb1d1115e"
   integrity sha512-62vfe65cMSzYaWmpmhqCMMNl0khen89w57mByPi1OseGfcV/LV03fO8YVrNj7rFQsRWNJo650WWyh6m7p8vZmA==
 
-"@types/lodash.merge@^4.6.6":
-  version "4.6.6"
-  resolved "https://registry.yarnpkg.com/@types/lodash.merge/-/lodash.merge-4.6.6.tgz#b84b403c1d31bc42d51772d1cd5557fa008cd3d6"
-  integrity sha512-IB90krzMf7YpfgP3u/EvZEdXVvm4e3gJbUvh5ieuI+o+XqiNEt6fCzqNRaiLlPVScLI59RxIGZMQ3+Ko/DJ8vQ==
-  dependencies:
-    "@types/lodash" "*"
-
-"@types/lodash@*":
-  version "4.14.175"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45"
-  integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw==
-
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"