ut2 1.14.0 → 1.15.0

package/es/index.js

@@ -90,6 +90,7 @@ export { default as invert } from './invert.js';
 export { default as keys } from './keys.js';
 export { default as keysIn } from './keysIn.js';
 export { default as merge } from './merge.js';
+export { default as mergeObject } from './mergeObject.js';
 export { default as omit } from './omit.js';
 export { default as omitBy } from './omitBy.js';
 export { default as pick } from './pick.js';

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.14.0";
+var VERSION = "1.15.0";
 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/mergeObject.js

@@ -0,0 +1,17 @@
+import { __read, __spreadArray } from 'tslib';
+import merge from './merge.js';
+
+var mergeObject = function (object, source) {
+    var args = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        args[_i - 2] = arguments[_i];
+    }
+    if (args.length > 0) {
+        var _a = __read(args), arg1 = _a[0], restArgs = _a.slice(1);
+        var obj = merge(object, source, merge.NOT_MERGE_ARRAYS);
+        return mergeObject.apply(void 0, __spreadArray([obj, arg1], __read(restArgs), false));
+    }
+    return merge(object, source, merge.NOT_MERGE_ARRAYS);
+};
+
+export { mergeObject as default };

package/lib/index.js

@@ -92,6 +92,7 @@ var invert = require('./invert.js');
 var keys = require('./keys.js');
 var keysIn = require('./keysIn.js');
 var merge = require('./merge.js');
+var mergeObject = require('./mergeObject.js');
 var omit = require('./omit.js');
 var omitBy = require('./omitBy.js');
 var pick = require('./pick.js');
@@ -234,6 +235,7 @@ exports.invert = invert;
 exports.keys = keys;
 exports.keysIn = keysIn;
 exports.merge = merge;
+exports.mergeObject = mergeObject;
 exports.omit = omit;
 exports.omitBy = omitBy;
 exports.pick = pick;

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.14.0";
+var VERSION = "1.15.0";
 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/mergeObject.js

@@ -0,0 +1,19 @@
+'use strict';
+
+var tslib = require('tslib');
+var merge = require('./merge.js');
+
+var mergeObject = function (object, source) {
+    var args = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        args[_i - 2] = arguments[_i];
+    }
+    if (args.length > 0) {
+        var _a = tslib.__read(args), arg1 = _a[0], restArgs = _a.slice(1);
+        var obj = merge(object, source, merge.NOT_MERGE_ARRAYS);
+        return mergeObject.apply(void 0, tslib.__spreadArray([obj, arg1], tslib.__read(restArgs), false));
+    }
+    return merge(object, source, merge.NOT_MERGE_ARRAYS);
+};
+
+module.exports = mergeObject;

package/package.json

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

package/types/fromPairs.d.ts

@@ -7,6 +7,8 @@ interface FromPairs {
  *
  * 与 [Object.entries](https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Object/entries) 正好相反。
  *
+ * @deprecated 即将废弃，请使用 `Object.fromEntries` 替代。
+ * @private
  * @alias module:Array.fromPairs
  * @since 1.0.0
  * @param {Array} array 键值对数组。

package/types/index.d.ts

@@ -132,6 +132,7 @@ export { default as invert } from './invert';
 export { default as keys } from './keys';
 export { default as keysIn } from './keysIn';
 export { default as merge } from './merge';
+export { default as mergeObject } from './mergeObject';
 export { default as omit } from './omit';
 export { default as omitBy } from './omitBy';
 export { default as pick } from './pick';

package/types/mergeObject.d.ts

@@ -0,0 +1,41 @@
+interface MergeObject {
+    <T1, T2>(t1: T1, t2: T2): T1 & T2;
+    <T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 & T2 & T3;
+    <T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 & T2 & T3 & T4;
+    <T1, T2, T3, T4, T5>(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): T1 & T2 & T3 & T4 & T5;
+    <T1, T2, T3, T4, T5, T6>(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6): T1 & T2 & T3 & T4 & T5 & T6;
+    <T1, T2, T3, T4, T5, T6, T7>(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7): T1 & T2 & T3 & T4 & T5 & T6 & T7;
+    <T1, T2, T3, T4, T5, T6, T7, T8>(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8): T1 & T2 & T3 & T4 & T5 & T6 & T7 & T8;
+    <T1, T2, T3, T4, T5, T6, T7, T8, T9>(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8, t9: T9): T1 & T2 & T3 & T4 & T5 & T6 & T7 & T8 & T9;
+    <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7, t8: T8, t9: T9, t10: T10): T1 & T2 & T3 & T4 & T5 & T6 & T7 & T8 & T9 & T10;
+    <T1, T2, T>(t1: T1, t2: T2, ...args: T[]): T1 & T2 & T;
+}
+/**
+ * 递归合并 `source` 来源对象自身的可枚举属性（包含 `Symbol` 属性）到 `object` 目标对象。
+ *
+ * 与 `merge` 方法的区别：
+ *
+ * 1. 不合并数组，如果只传入 `2` 个参数，同 `merge(obj, src, merge.NOT_MERGE_ARRAYS)`
+ * 2. 不支持自定义赋值函数和获取对象键，但支持多个来源对象参数
+ *
+ * @alias module:Object.mergeObject
+ * @since 1.15.0
+ * @param {Object | Array} object 目标对象。
+ * @param {...object} args 展开的来源对象。
+ * @returns 目标对象。
+ * @example
+ *
+ * mergeObject({c: 3}, {e: 5}); // { c: 3, e: 5 }
+ * mergeObject({ a: 1 }, { a: undefined, b: undefined }); // { a: 1, b: undefined }
+ * mergeObject({ a: 1 }, { a: undefined, b: undefined }, {c:'x'}); // { a: 1, b: undefined, c: 'x' }
+ *
+ * const source = {
+ *   a: [{b: 2}, {d: 4}]
+ * }
+ * const otherSource = {
+ *   a: [{c: 3},{e: 5}]
+ * }
+ * mergeObject({}, source, otherSource); // { a: [{c: 3}, {e: 5}] }
+ */
+declare const mergeObject: MergeObject;
+export default mergeObject;