feat: remove rfdc

Author: runkids

package.json

@@ -53,8 +53,7 @@
     ]
   },
   "dependencies": {
-    "vue-demi": "latest",
-    "rfdc": "^1.1.4"
+    "vue-demi": "latest"
   },
   "devDependencies": {
     "@types/jest": "24.0.20",

src/useConditionWatcher.ts

@@ -1,16 +1,22 @@
 import { reactive, ref, watch, inject, onMounted, onUnmounted } from 'vue-demi'
 import { ConditionsType, Config, QueryOptions, ResultInterface } from './types'
-import { filterNoneValueObject, createParams, stringifyQuery, syncQuery2Conditions, isEquivalentString } from './utils'
+import {
+  filterNoneValueObject,
+  createParams,
+  stringifyQuery,
+  syncQuery2Conditions,
+  isEquivalent,
+  deepClone,
+} from './utils'
 import { useFetchData } from './useFetchData'
 import { useParseQuery } from './useParseQuery'
-import clone from 'rfdc'
 
 export default function useConditionWatcher<T extends Config, E extends QueryOptions<E>>(
   config: T,
   queryOptions?: E
 ): ResultInterface {
   let router = null
-  const backupIntiConditions = clone({ proto: true })(config.conditions)
+  const backupIntiConditions = deepClone(config.conditions)
   const _conditions = reactive(config.conditions)
   const loading = ref(false)
   const data = ref(null)
@@ -45,7 +51,7 @@ export default function useConditionWatcher<T extends Config, E extends QueryOpt
   const conditionChangeHandler = (conditions) => {
     const conditions2Object: ConditionsType = conditions
     let customConditions: ConditionsType = {}
-    const deepCopyCondition: ConditionsType = clone({ proto: true })(conditions2Object)
+    const deepCopyCondition: ConditionsType = deepClone(conditions2Object)
 
     if (typeof config.beforeFetch === 'function') {
       customConditions = config.beforeFetch(deepCopyCondition)
@@ -72,17 +78,20 @@ export default function useConditionWatcher<T extends Config, E extends QueryOpt
 
   watch(
     () => ({ ..._conditions }),
-    (conditions) => conditionChangeHandler(conditions)
+    (nc, oc) => {
+      if (completeInitialConditions.value && isEquivalent(nc, oc)) return
+      conditionChangeHandler(nc)
+    }
   )
 
   if (queryOptions && typeof queryOptions.sync === 'string' && queryOptions.sync.length) {
     router = inject(queryOptions.sync)
     if (router) {
       // initial conditions by window.location.search. just do once.
       syncConditionsByQuery()
-      // watch query changed
-      watch(query, async (newQuery, prevQuery) => {
-        if (isEquivalentString(newQuery, prevQuery, queryOptions.ignore || [])) return
+      conditionChangeHandler({ ..._conditions })
+      // watch query changed to push
+      watch(query, async () => {
         const path: string = router.currentRoute.value ? router.currentRoute.value.path : router.currentRoute.path
         const queryString = stringifyQuery(query.value, queryOptions.ignore || [])
         await router.push(path + '?' + queryString).catch((e) => e)

src/utils.ts

@@ -114,3 +114,21 @@ export function isEquivalent(x, y) {
     })
   )
 }
+
+export function deepClone(obj) {
+  if (obj === null) return null
+  let clone = Object.assign({}, obj)
+  Object.keys(clone).forEach((key) => {
+    if (obj[key] instanceof Date) {
+      const original = obj[key]
+      clone[key] = new Date(original)
+      return
+    }
+    clone[key] = typeof obj[key] === 'object' ? deepClone(obj[key]) : obj[key]
+  })
+  return Array.isArray(obj) && obj.length
+    ? (clone.length = obj.length) && Array.from(clone)
+    : Array.isArray(obj)
+    ? Array.from(obj)
+    : clone
+}

test/utils.test.ts

@@ -1,4 +1,11 @@
-import { filterNoneValueObject, createParams, stringifyQuery, syncQuery2Conditions, isEquivalent } from '../src/utils'
+import {
+  filterNoneValueObject,
+  createParams,
+  stringifyQuery,
+  syncQuery2Conditions,
+  isEquivalent,
+  deepClone,
+} from '../src/utils'
 
 describe('utils: isEquivalent', () => {
   it(`Check Object Equality`, () => {
@@ -20,6 +27,21 @@ describe('utils: isEquivalent', () => {
   })
 })
 
+describe('utils: deepClone', () => {
+  it(`Check Object deepClone`, () => {
+    const current = {
+      name: '',
+      tags: [],
+      phone: undefined,
+      address: null,
+      data: new Date(),
+    }
+    const newObj = deepClone(current)
+    expect(newObj !== current).toBeTruthy()
+    expect(newObj.data !== current.data).toBeTruthy()
+  })
+})
+
 describe('utils: filterNoneValueObject', () => {
   it(`Should be return empty object`, () => {
     const conditions = {

yarn.lock

@@ -3798,11 +3798,6 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-rfdc@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
-  integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==
-
 rimraf@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"