@rc-component/util 1.4.0 → 1.5.0

package/es/index.d.ts

@@ -3,7 +3,7 @@ export { default as useMergedState } from './hooks/useMergedState';
 export { default as useControlledState } from './hooks/useControlledState';
 export { supportNodeRef, supportRef, useComposeRef } from './ref';
 export { default as get } from './utils/get';
-export { default as set, merge } from './utils/set';
+export { default as set, merge, mergeWith } from './utils/set';
 export { default as warning, noteOnce } from './warning';
 export { default as omit } from './omit';
 export { default as toArray } from './Children/toArray';

package/es/index.js

@@ -3,7 +3,7 @@ export { default as useMergedState } from "./hooks/useMergedState";
 export { default as useControlledState } from "./hooks/useControlledState";
 export { supportNodeRef, supportRef, useComposeRef } from "./ref";
 export { default as get } from "./utils/get";
-export { default as set, merge } from "./utils/set";
+export { default as set, merge, mergeWith } from "./utils/set";
 export { default as warning, noteOnce } from "./warning";
 export { default as omit } from "./omit";
 export { default as toArray } from "./Children/toArray";

package/es/utils/set.d.ts

@@ -1,6 +1,18 @@
 export type Path = (string | number | symbol)[];
 export default function set<Entity = any, Output = Entity, Value = any>(entity: Entity, paths: Path, value: Value, removeIfUndefined?: boolean): Output;
+export type MergeFn = (current: any, next: any) => any;
 /**
- * Merge objects which will create
+ * Merge multiple objects. Support custom merge logic.
+ * @param sources object sources
+ * @param config.prepareArray Customize array prepare function.
+ * It will return empty [] by default.
+ * So when match array, it will auto be override with next array in sources.
+ */
+export declare function mergeWith<T extends object>(sources: T[], config?: {
+    prepareArray?: MergeFn;
+}): T;
+/**
+ * Merge multiple objects into a new single object.
+ * Arrays will be replaced by default.
  */
 export declare function merge<T extends object>(...sources: T[]): T;

package/es/utils/set.js

@@ -38,10 +38,20 @@ function createEmpty(source) {
 }
 const keys = typeof Reflect === 'undefined' ? Object.keys : Reflect.ownKeys;
 
+// ================================ Merge ================================
+
 /**
- * Merge objects which will create
+ * Merge multiple objects. Support custom merge logic.
+ * @param sources object sources
+ * @param config.prepareArray Customize array prepare function.
+ * It will return empty [] by default.
+ * So when match array, it will auto be override with next array in sources.
  */
-export function merge(...sources) {
+export function mergeWith(sources, config = {}) {
+  const {
+    prepareArray
+  } = config;
+  const finalPrepareArray = prepareArray || (() => []);
   let clone = createEmpty(sources[0]);
   sources.forEach(src => {
     function internalMerge(path, parentLoopSet) {
@@ -55,7 +65,7 @@ export function merge(...sources) {
           const originValue = get(clone, path);
           if (isArr) {
             // Array will always be override
-            clone = set(clone, path, []);
+            clone = set(clone, path, finalPrepareArray(originValue, value));
           } else if (!originValue || typeof originValue !== 'object') {
             // Init container if not exist
             clone = set(clone, path, createEmpty(value));
@@ -71,4 +81,12 @@ export function merge(...sources) {
     internalMerge([]);
   });
   return clone;
+}
+
+/**
+ * Merge multiple objects into a new single object.
+ * Arrays will be replaced by default.
+ */
+export function merge(...sources) {
+  return mergeWith(sources);
 }

package/lib/index.d.ts

@@ -3,7 +3,7 @@ export { default as useMergedState } from './hooks/useMergedState';
 export { default as useControlledState } from './hooks/useControlledState';
 export { supportNodeRef, supportRef, useComposeRef } from './ref';
 export { default as get } from './utils/get';
-export { default as set, merge } from './utils/set';
+export { default as set, merge, mergeWith } from './utils/set';
 export { default as warning, noteOnce } from './warning';
 export { default as omit } from './omit';
 export { default as toArray } from './Children/toArray';

package/lib/index.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "merge", {
     return _set.merge;
   }
 });
+Object.defineProperty(exports, "mergeWith", {
+  enumerable: true,
+  get: function () {
+    return _set.mergeWith;
+  }
+});
 Object.defineProperty(exports, "noteOnce", {
   enumerable: true,
   get: function () {

package/lib/utils/set.d.ts

@@ -1,6 +1,18 @@
 export type Path = (string | number | symbol)[];
 export default function set<Entity = any, Output = Entity, Value = any>(entity: Entity, paths: Path, value: Value, removeIfUndefined?: boolean): Output;
+export type MergeFn = (current: any, next: any) => any;
 /**
- * Merge objects which will create
+ * Merge multiple objects. Support custom merge logic.
+ * @param sources object sources
+ * @param config.prepareArray Customize array prepare function.
+ * It will return empty [] by default.
+ * So when match array, it will auto be override with next array in sources.
+ */
+export declare function mergeWith<T extends object>(sources: T[], config?: {
+    prepareArray?: MergeFn;
+}): T;
+/**
+ * Merge multiple objects into a new single object.
+ * Arrays will be replaced by default.
  */
 export declare function merge<T extends object>(...sources: T[]): T;

package/lib/utils/set.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = set;
 exports.merge = merge;
+exports.mergeWith = mergeWith;
 var _get = _interopRequireDefault(require("./get"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function internalSet(entity, paths, value, removeIfUndefined) {
@@ -46,10 +47,20 @@ function createEmpty(source) {
 }
 const keys = typeof Reflect === 'undefined' ? Object.keys : Reflect.ownKeys;
 
+// ================================ Merge ================================
+
 /**
- * Merge objects which will create
+ * Merge multiple objects. Support custom merge logic.
+ * @param sources object sources
+ * @param config.prepareArray Customize array prepare function.
+ * It will return empty [] by default.
+ * So when match array, it will auto be override with next array in sources.
  */
-function merge(...sources) {
+function mergeWith(sources, config = {}) {
+  const {
+    prepareArray
+  } = config;
+  const finalPrepareArray = prepareArray || (() => []);
   let clone = createEmpty(sources[0]);
   sources.forEach(src => {
     function internalMerge(path, parentLoopSet) {
@@ -63,7 +74,7 @@ function merge(...sources) {
           const originValue = (0, _get.default)(clone, path);
           if (isArr) {
             // Array will always be override
-            clone = set(clone, path, []);
+            clone = set(clone, path, finalPrepareArray(originValue, value));
           } else if (!originValue || typeof originValue !== 'object') {
             // Init container if not exist
             clone = set(clone, path, createEmpty(value));
@@ -79,4 +90,12 @@ function merge(...sources) {
     internalMerge([]);
   });
   return clone;
+}
+
+/**
+ * Merge multiple objects into a new single object.
+ * Arrays will be replaced by default.
+ */
+function merge(...sources) {
+  return mergeWith(sources);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/util",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Common Utils For React Component",
   "keywords": [
     "react",