Skip to content

Commit eece4e2

Browse files
committed
chore: rename
1 parent ce49d32 commit eece4e2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/utils/set.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export type MergeFn = (current: any, next: any) => any;
7676
* It will return empty [] by default.
7777
* So when match array, it will auto be override with next array in sources.
7878
*/
79-
export function deepMerge<T extends object>(
79+
export function customMerge<T extends object>(
8080
sources: T[],
8181
config: {
8282
prepareArray?: MergeFn;
@@ -130,5 +130,5 @@ export function deepMerge<T extends object>(
130130
* Arrays will be replaced by default.
131131
*/
132132
export function merge<T extends object>(...sources: T[]) {
133-
return deepMerge(sources);
133+
return customMerge(sources);
134134
}

tests/utils.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pickAttrs from '../src/pickAttrs';
22
import get from '../src/utils/get';
3-
import set, { deepMerge, merge } from '../src/utils/set';
3+
import set, { customMerge, merge } from '../src/utils/set';
44

55
describe('utils', () => {
66
it('get', () => {
@@ -253,7 +253,7 @@ describe('utils', () => {
253253
});
254254
});
255255

256-
it('deepMerge for custom logic', () => {
256+
it('customMerge for custom logic', () => {
257257
const src = {
258258
rest: 233,
259259
list: [
@@ -270,7 +270,7 @@ describe('utils', () => {
270270
],
271271
};
272272

273-
const merged = deepMerge<any>([src, tgt], {
273+
const merged = customMerge<any>([src, tgt], {
274274
prepareArray: current => {
275275
return [...(current || [])];
276276
},

0 commit comments

Comments
 (0)