fix: resetConditions only assign value if property exists

Author: runkids

_internal/package.json

@@ -7,6 +7,7 @@
   "exports": "./dist/index.mjs",
   "private": true,
   "scripts": {
+    "watch": "bunchee index.ts --no-sourcemap -w",
     "build": "bunchee index.ts --no-sourcemap",
     "types:check": "tsc --noEmit",
     "clean": "rimraf dist"

_internal/utils/common.ts

@@ -173,6 +173,16 @@ export function sortObject(unordered) {
     }, {})
 }
 
+export function pick(obj: Record<string, any>, keys: string[]) {
+  const res = {}
+  keys.forEach((key) => {
+    if (key in obj) {
+      res[key] = obj[key]
+    }
+  })
+  return res
+}
+
 export function serializeFunc(fn) {
   //the source code from https://github.com/yahoo/serialize-javascript/blob/main/index.js
   const serializedFn = fn.toString()

core/package.json

@@ -7,6 +7,7 @@
   "exports": "./dist/index.mjs",
   "private": true,
   "scripts": {
+    "watch": "bunchee index.ts --no-sourcemap -w",
     "build": "bunchee index.ts --no-sourcemap",
     "types:check": "tsc --noEmit",
     "clean": "rimraf dist"

core/use-condition-watcher.ts

@@ -20,6 +20,7 @@ import {
   syncQuery2Conditions,
   isEquivalent,
   deepClone,
+  pick,
 } from 'vue-condition-watcher/_internal'
 import { containsProp, isNoData as isDataEmpty, isObject, isServer, rAF } from 'vue-condition-watcher/_internal'
 
@@ -103,7 +104,8 @@ export default function useConditionWatcher<Cond extends Record<string, any>, Re
   } = createEvents()
 
   const resetConditions = (cond?: Record<string, any>): void => {
-    Object.assign(_conditions, isObject(cond) && !cond.type ? cond : backupIntiConditions)
+    const conditionKeys = Object.keys(_conditions)
+    Object.assign(_conditions, isObject(cond) ? pick(cond, conditionKeys) : backupIntiConditions)
   }
 
   const isLoading = computed(() => !error.value && !data.value)

package.json

@@ -31,6 +31,7 @@
   "scripts": {
     "clean": "turbo run clean",
     "build": "turbo run build",
+    "watch": "turbo run watch --parallel",
     "types:check": "turbo run types:check",
     "format": "prettier --write ./**/*.ts",
     "lint": "eslint . --ext .ts --cache",
@@ -39,7 +40,6 @@
     "test:2": "vue-demi-switch 2 vue2 && vitest run",
     "test:3": "vue-demi-switch 3 && vitest run",
     "test:all": "pnpm format && pnpm build && pnpm test:3 && pnpm test:2 && vue-demi-switch 3",
-    "watch": "tsc --watch",
     "prepublishOnly": "pnpm clean && pnpm build",
     "publish-beta": "pnpm publish --tag beta"
   },

test/use-condition-watcher.test.ts

@@ -2,18 +2,22 @@ import useConditionWatcher from 'vue-condition-watcher'
 import { isRef, isReactive, isReadonly, createApp, nextTick, defineComponent } from 'vue-demi'
 import type { VueWrapper } from '@vue/test-utils'
 import { mount } from '@vue/test-utils'
-import { describe, expect, test, vi } from 'vitest'
+import { describe, expect, test, vi, beforeEach } from 'vitest'
 
 describe('Basic test of vue-condition-watcher', () => {
-  it(`Check return value type`, () => {
-    const config = {
+  let basicTestConfig = {}
+  beforeEach(() => {
+    basicTestConfig = {
       fetcher: (params) => new Promise((resolve) => resolve(params)),
       conditions: {
         gender: ['male'],
         results: 9,
       },
     }
-    const { conditions, data, error, isLoading, execute } = useConditionWatcher(config)
+  })
+
+  it(`Check return value type`, () => {
+    const { conditions, data, error, isLoading, execute } = useConditionWatcher(basicTestConfig)
 
     expect(isReactive(conditions)).toBeTruthy()
     expect(isRef(data)).toBeTruthy()
@@ -24,30 +28,15 @@ describe('Basic test of vue-condition-watcher', () => {
   })
 
   it(`Check data, error, isLoading is readonly`, () => {
-    const config = {
-      fetcher: (params) => new Promise((resolve) => resolve(params)),
-      conditions: {
-        gender: ['male'],
-        results: 9,
-      },
-    }
-
-    const { data, error, isLoading } = useConditionWatcher(config)
+    const { data, error, isLoading } = useConditionWatcher(basicTestConfig)
 
     expect(isReadonly(data)).toBeTruthy()
     expect(isReadonly(error)).toBeTruthy()
     expect(isReadonly(isLoading)).toBeTruthy()
   })
 
   it(`Condition should be change`, () => {
-    const config = {
-      fetcher: (params) => new Promise((resolve) => resolve(params)),
-      conditions: {
-        gender: ['male'],
-        results: 9,
-      },
-    }
-    const { conditions } = useConditionWatcher(config)
+    const { conditions } = useConditionWatcher(basicTestConfig)
 
     expect(conditions).toMatchObject({
       gender: ['male'],
@@ -61,6 +50,39 @@ describe('Basic test of vue-condition-watcher', () => {
       results: 10,
     })
   })
+
+  it('Reset conditions to initial value', () => {
+    const { conditions, resetConditions } = useConditionWatcher(basicTestConfig)
+
+    conditions.results = 10
+    conditions.gender = ['male', 'female']
+
+    resetConditions()
+
+    expect(conditions).toMatchObject({
+      gender: ['male'],
+      results: 9,
+    })
+  })
+
+  it('Reset conditions to custom value and only assign if property exists.', () => {
+    const { conditions, resetConditions } = useConditionWatcher(basicTestConfig)
+
+    conditions.results = 10
+    conditions.gender = ['male', 'female']
+
+    resetConditions({
+      gender: ['female'],
+      results: 19,
+      type: '2',
+      useless: '12312321',
+    })
+
+    expect(conditions).toMatchObject({
+      gender: ['female'],
+      results: 19,
+    })
+  })
 })
 
 // const tick = async (times: number) => {

test/utils.test.ts

@@ -6,6 +6,7 @@ import {
   isEquivalent,
   deepClone,
   typeOf,
+  pick,
 } from 'vue-condition-watcher/_internal'
 import { describe, expect, test } from 'vitest'
 
@@ -197,3 +198,15 @@ describe('utils: syncQuery2Conditions', () => {
     })
   })
 })
+
+describe('utils: pick', () => {
+  it('Assign only if property exists in target object', () => {
+    const targetObj = { name: 'Runkids', age: 10 }
+    const resObj = pick({ age: 20, name: 'runkids', nickname: 'egg' }, Object.keys(targetObj))
+
+    expect(Object.assign(targetObj, resObj)).toMatchObject({
+      name: 'runkids',
+      age: 20,
+    })
+  })
+})

turbo.json

@@ -6,6 +6,9 @@
       "dependsOn": ["^build"]
     },
     "types:check": {},
+    "watch": {
+      "cache": false
+    },
     "clean": {
       "cache": false
     }