refactor: Use rc-util for merge (#590)

* refactor: use rc-util

* chore: bump rc-util

* chore: update deps

Author: zombieJ

package.json

@@ -51,7 +51,7 @@
   "dependencies": {
     "@babel/runtime": "^7.18.0",
     "async-validator": "^4.1.0",
-    "rc-util": "^5.8.0"
+    "rc-util": "^5.32.2"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.4",

src/useForm.ts

@@ -25,7 +25,7 @@ import type {
   WatchCallBack,
 } from './interface';
 import { allPromiseFinish } from './utils/asyncUtil';
-import cloneDeep from './utils/cloneDeep';
+import { merge } from 'rc-util/lib/utils/set';
 import { defaultValidateMessages } from './utils/messages';
 import NameMap from './utils/NameMap';
 import {
@@ -35,7 +35,6 @@ import {
   getValue,
   matchNamePath,
   setValue,
-  setValues,
 } from './utils/valueUtil';
 
 type InvalidateFieldEntity = { INVALIDATE_NAME_PATH: InternalNamePath };
@@ -141,7 +140,7 @@ export class FormStore {
   private setInitialValues = (initialValues: Store, init: boolean) => {
     this.initialValues = initialValues || {};
     if (init) {
-      let nextStore = setValues({}, initialValues, this.store);
+      let nextStore = merge(initialValues, this.store);
 
       // We will take consider prev form unmount fields.
       // When the field is not `preserve`, we need fill this with initialValues instead of store.
@@ -170,7 +169,7 @@ export class FormStore {
     const initValue = getValue(this.initialValues, namePath);
 
     // Not cloneDeep when without `namePath`
-    return namePath.length ? cloneDeep(initValue) : initValue;
+    return namePath.length ? merge(initValue) : initValue;
   };
 
   private setCallbacks = (callbacks: Callbacks) => {
@@ -523,7 +522,7 @@ export class FormStore {
 
     const prevStore = this.store;
     if (!nameList) {
-      this.updateStore(setValues({}, this.initialValues));
+      this.updateStore(merge(this.initialValues));
       this.resetWithFieldInitialValue();
       this.notifyObservers(prevStore, null, { type: 'reset' });
       this.notifyWatch();
@@ -743,7 +742,7 @@ export class FormStore {
     const prevStore = this.store;
 
     if (store) {
-      const nextStore = setValues(this.store, store);
+      const nextStore = merge(this.store, store);
       this.updateStore(nextStore);
     }
 

src/utils/cloneDeep.ts

@@ -9,7 +9,7 @@ import type {
   RuleError,
 } from '../interface';
 import { defaultValidateMessages } from './messages';
-import { setValues } from './valueUtil';
+import { merge } from 'rc-util/lib/utils/set';
 
 // Remove incorrect original ts define
 const AsyncValidator: any = RawAsyncValidator;
@@ -67,7 +67,7 @@ async function validateRule(
     [name]: [cloneRule],
   });
 
-  const messages = setValues({}, defaultValidateMessages, options.validateMessages);
+  const messages = merge(defaultValidateMessages, options.validateMessages);
   validator.messages(messages);
 
   let result = [];

src/utils/validateUtil.ts

@@ -1,8 +1,7 @@
 import getValue from 'rc-util/lib/utils/get';
 import setValue from 'rc-util/lib/utils/set';
-import type { InternalNamePath, NamePath, Store, StoreValue, EventArgs } from '../interface';
+import type { InternalNamePath, NamePath, Store, EventArgs } from '../interface';
 import { toArray } from './typeUtil';
-import cloneDeep from '../utils/cloneDeep';
 
 export { getValue, setValue };
 
@@ -31,41 +30,6 @@ export function containsNamePath(namePathList: InternalNamePath[], namePath: Int
   return namePathList && namePathList.some(path => matchNamePath(path, namePath));
 }
 
-function isObject(obj: StoreValue) {
-  return typeof obj === 'object' && obj !== null && Object.getPrototypeOf(obj) === Object.prototype;
-}
-
-/**
- * Copy values into store and return a new values object
- * ({ a: 1, b: { c: 2 } }, { a: 4, b: { d: 5 } }) => { a: 4, b: { c: 2, d: 5 } }
- */
-function internalSetValues<T>(store: T, values: T): T {
-  const newStore: T = (Array.isArray(store) ? [...store] : { ...store }) as T;
-
-  if (!values) {
-    return newStore;
-  }
-
-  Object.keys(values).forEach(key => {
-    const prevValue = newStore[key];
-    const value = values[key];
-
-    // If both are object (but target is not array), we use recursion to set deep value
-    const recursive = isObject(prevValue) && isObject(value);
-
-    newStore[key] = recursive ? internalSetValues(prevValue, value || {}) : cloneDeep(value); // Clone deep for arrays
-  });
-
-  return newStore;
-}
-
-export function setValues<T>(store: T, ...restValues: T[]): T {
-  return restValues.reduce(
-    (current: T, newStore: T): T => internalSetValues<T>(current, newStore),
-    store,
-  );
-}
-
 export function matchNamePath(
   namePath: InternalNamePath,
   changedNamePath: InternalNamePath | null,

src/utils/valueUtil.ts

@@ -1,6 +1,5 @@
-import { move, isSimilar, setValues } from '../src/utils/valueUtil';
+import { move, isSimilar } from '../src/utils/valueUtil';
 import NameMap from '../src/utils/NameMap';
-import cloneDeep from '../src/utils/cloneDeep';
 
 describe('utils', () => {
   describe('arrayMove', () => {
@@ -31,19 +30,6 @@ describe('utils', () => {
       expect(isSimilar({}, null)).toBeFalsy();
       expect(isSimilar(null, {})).toBeFalsy();
     });
-
-    describe('setValues', () => {
-      it('basic', () => {
-        expect(setValues({}, { a: 1 }, { b: 2 })).toEqual({ a: 1, b: 2 });
-        expect(setValues([], [123])).toEqual([123]);
-      });
-
-      it('Correct handle class instance', () => {
-        const out = setValues({}, { a: 1, b: { c: new Date() } });
-        expect(out.a).toEqual(1);
-        expect(out.b.c instanceof Date).toBeTruthy();
-      });
-    });
   });
 
   describe('NameMap', () => {
@@ -72,12 +58,4 @@ describe('utils', () => {
       });
     });
   });
-
-  describe('clone deep', () => {
-    it('should not deep clone Class', () => {
-      const data = { a: new Date() };
-      const clonedData = cloneDeep(data);
-      expect(data.a === clonedData.a).toBeTruthy();
-    });
-  });
 });