ut2 1.10.0 → 1.10.1

package/es/internals/helpers.js

@@ -2,7 +2,7 @@ import isObjectLike from '../isObjectLike.js';
 import getTag from './getTag.js';
 import { argumentsTag, stringUndefined, functionProtoToString } from './native.js';
 
-var VERSION = "1.10.0";
+var VERSION = "1.10.1";
 var isBrowser = typeof window !== stringUndefined && isObjectLike(window) && typeof document !== stringUndefined && isObjectLike(document) && window.document === document;
 var supportedArgumentsType = getTag((function () { return arguments; })()) === argumentsTag;
 var FUNC_ERROR_TEXT = 'Expected a function';

package/es/merge.js

@@ -51,5 +51,6 @@ function merge(object, source, customizer, getKeys) {
     if (getKeys === void 0) { getKeys = allKeys; }
     return baseMerge(object, source, getKeys, customizer);
 }
+merge.NOT_MERGE_ARRAYS = function (objValue, srcValue) { return (isArray(srcValue) ? srcValue : undefined); };
 
 export { merge as default };

package/lib/internals/helpers.js

@@ -4,7 +4,7 @@ var isObjectLike = require('../isObjectLike.js');
 var getTag = require('./getTag.js');
 var native = require('./native.js');
 
-var VERSION = "1.10.0";
+var VERSION = "1.10.1";
 var isBrowser = typeof window !== native.stringUndefined && isObjectLike(window) && typeof document !== native.stringUndefined && isObjectLike(document) && window.document === document;
 var supportedArgumentsType = getTag((function () { return arguments; })()) === native.argumentsTag;
 var FUNC_ERROR_TEXT = 'Expected a function';

package/lib/merge.js

@@ -53,5 +53,6 @@ function merge(object, source, customizer, getKeys) {
     if (getKeys === void 0) { getKeys = allKeys; }
     return baseMerge(object, source, getKeys, customizer);
 }
+merge.NOT_MERGE_ARRAYS = function (objValue, srcValue) { return (isArray(srcValue) ? srcValue : undefined); };
 
 module.exports = merge;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ut2",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "author": "caijf",
   "license": "MIT",
   "main": "lib/index.js",

package/types/merge.d.ts

@@ -17,18 +17,27 @@ type Customizer = (objValue: any, srcValue: any, key: string | symbol, object: a
  * @returns {Object} 目标对象。
  * @example
  *
+ * merge({c: 3}, {e: 5}); // { c: 3, e: 5 }
+ * merge({ a: 1 }, { a: undefined, b: undefined }); // { a: 1, b: undefined }
+ *
  * const object = {
  *   a: [{b: 2}, {d: 4}]
  * }
- *
  * const other = {
  *   a: [{c: 3},{e: 5}]
  * }
  *
  * merge(object, other); // { a: [{b: 2, c: 3}, {d: 4, e: 5}] }
  *
- * // 自定义，数组不合并
+ * // 数组不合并
+ * merge(object, other, merge.NOT_MERGE_ARRAYS); // { a: [{c: 3},{e: 5}] }
+ *
+ * // 或自定义数组不合并方法
  * merge(object, other, (objValue, srcValue) => isArray(srcValue) ? srcValue : undefined); // { a: [{c: 3},{e: 5}] }
+ *
  */
 declare function merge<TObject, TSource>(object: TObject, source: TSource, customizer?: Customizer, getKeys?: GetKeysMethod): TObject & TSource;
+declare namespace merge {
+    var NOT_MERGE_ARRAYS: (objValue: any, srcValue: any) => any[] | undefined;
+}
 export default merge;