ut2 1.5.4 → 1.5.6

package/es/merge.js

@@ -2,6 +2,7 @@ import allKeysIn from './allKeysIn.js';
 import isArray from './isArray.js';
 import isObject from './isObject.js';
 import isObjectLike from './isObjectLike.js';
+import isPlainObject from './isPlainObject.js';
 
 function baseMerge(object, source, customizer, storage) {
     if (storage === void 0) { storage = new WeakMap(); }
@@ -16,17 +17,17 @@ function baseMerge(object, source, customizer, storage) {
         if (newValue === undefined) {
             newValue = srcValue;
         }
-        if (isObjectLike(newValue) && key in obj && !storage.has(newValue)) {
+        if (isObjectLike(newValue) && !storage.has(newValue)) {
             storage.set(newValue, true);
             var objValue = obj[key];
             var newObjValue = void 0;
             if (isArray(newValue)) {
                 newObjValue = isArray(objValue) ? objValue : [];
             }
-            else {
-                newObjValue = isObjectLike(objValue) ? objValue : {};
+            else if (isPlainObject(newValue)) {
+                newObjValue = isPlainObject(objValue) ? objValue : {};
             }
-            obj[key] = baseMerge(newObjValue, newValue, customizer, storage);
+            obj[key] = newObjValue ? baseMerge(newObjValue, newValue, customizer, storage) : newValue;
         }
         else {
             if (newValue !== undefined || (newValue === undefined && !(key in obj))) {

package/es/pickBy.js

@@ -1,10 +1,11 @@
 import allKeysIn from './allKeysIn.js';
 import { stubFlase } from './internals/helpers.js';
+import isNil from './isNil.js';
 
 function pickBy(object, predicate) {
     if (predicate === void 0) { predicate = stubFlase; }
     var result = {};
-    if (object === null) {
+    if (isNil(object)) {
         return result;
     }
     var keys = allKeysIn(object);

package/es/toString.js

@@ -1,5 +1,6 @@
 import { symbolProto } from './internals/native.js';
 import isArray from './isArray.js';
+import isNil from './isNil.js';
 import isSymbol from './isSymbol.js';
 
 var symbolToString = symbolProto ? symbolProto.toString : undefined;
@@ -17,7 +18,7 @@ function baseToString(value) {
     return result === '0' && 1 / value === -Infinity ? '-0' : result;
 }
 function toString(value) {
-    return value == null ? '' : baseToString(value);
+    return isNil(value) ? '' : baseToString(value);
 }
 
 export { toString as default };

package/lib/conformsTo.js

@@ -1,11 +1,12 @@
 'use strict';
 
 var allKeys = require('./allKeys.js');
+var isNil = require('./isNil.js');
 
 function conformsTo(object, source) {
     var props = allKeys(source);
     var length = props.length;
-    if (object == null) {
+    if (isNil(object)) {
         return !length;
     }
     if (length === 0) {

package/lib/internals/helpers.js

@@ -3,7 +3,7 @@
 var getTag = require('./getTag.js');
 var native = require('./native.js');
 
-exports.VERSION = "1.5.4";
+exports.VERSION = "1.5.6";
 exports.supportedArgumentsType = getTag((function () { return arguments; })()) === native.argumentsTag;
 exports.FUNC_ERROR_TEXT = 'Expected a function';
 function toSource(func) {

package/lib/isEmpty.js

@@ -4,10 +4,11 @@ var getTag = require('./internals/getTag.js');
 var keys = require('./internals/keys.js');
 var native = require('./internals/native.js');
 var isArrayLike = require('./isArrayLike.js');
+var isNil = require('./isNil.js');
 var isObjectLike = require('./isObjectLike.js');
 
 function isEmpty(value) {
-    if (value == null) {
+    if (isNil(value)) {
         return true;
     }
     var tag = getTag(value);

package/lib/merge.js

@@ -4,6 +4,7 @@ var allKeysIn = require('./allKeysIn.js');
 var isArray = require('./isArray.js');
 var isObject = require('./isObject.js');
 var isObjectLike = require('./isObjectLike.js');
+var isPlainObject = require('./isPlainObject.js');
 
 function baseMerge(object, source, customizer, storage) {
     if (storage === void 0) { storage = new WeakMap(); }
@@ -18,17 +19,17 @@ function baseMerge(object, source, customizer, storage) {
         if (newValue === undefined) {
             newValue = srcValue;
         }
-        if (isObjectLike(newValue) && key in obj && !storage.has(newValue)) {
+        if (isObjectLike(newValue) && !storage.has(newValue)) {
             storage.set(newValue, true);
             var objValue = obj[key];
             var newObjValue = void 0;
             if (isArray(newValue)) {
                 newObjValue = isArray(objValue) ? objValue : [];
             }
-            else {
-                newObjValue = isObjectLike(objValue) ? objValue : {};
+            else if (isPlainObject(newValue)) {
+                newObjValue = isPlainObject(objValue) ? objValue : {};
             }
-            obj[key] = baseMerge(newObjValue, newValue, customizer, storage);
+            obj[key] = newObjValue ? baseMerge(newObjValue, newValue, customizer, storage) : newValue;
         }
         else {
             if (newValue !== undefined || (newValue === undefined && !(key in obj))) {

package/lib/pickBy.js

@@ -2,11 +2,12 @@
 
 var allKeysIn = require('./allKeysIn.js');
 var helpers = require('./internals/helpers.js');
+var isNil = require('./isNil.js');
 
 function pickBy(object, predicate) {
     if (predicate === void 0) { predicate = helpers.stubFlase; }
     var result = {};
-    if (object === null) {
+    if (isNil(object)) {
         return result;
     }
     var keys = allKeysIn(object);

package/lib/toString.js

@@ -2,6 +2,7 @@
 
 var native = require('./internals/native.js');
 var isArray = require('./isArray.js');
+var isNil = require('./isNil.js');
 var isSymbol = require('./isSymbol.js');
 
 var symbolToString = native.symbolProto ? native.symbolProto.toString : undefined;
@@ -19,7 +20,7 @@ function baseToString(value) {
     return result === '0' && 1 / value === -Infinity ? '-0' : result;
 }
 function toString(value) {
-    return value == null ? '' : baseToString(value);
+    return isNil(value) ? '' : baseToString(value);
 }
 
 module.exports = toString;

package/package.json

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

package/types/internals/isEqualDeep.d.ts

@@ -11,15 +11,13 @@ type Customizer = (objValue: any, othValue: any, key?: number | string | symbol,
  * 2. `typeof` 不同类型，如 `1` `Object(1)`
  * 3. 无效日期对象，如 `new Date('')` `new Date('abc')`
  *
- * @static
- * @alias module:Language.isEqual
- * @since 1.3.0
+ * @private
  * @param {*} value 要比较的值。
  * @param {*} other 另一个要比较的值。
  * @param {Function} [customizer] 自定义比较。
  * @param {boolean} [strictCheck=false] 严格比较，默认 `false` 。
- * @param {*[]} [valueStack] 值的堆栈。
- * @param {*[]} [otherStack] 另一个值的堆栈。
+ * @param {Array} [valueStack] 值的堆栈。
+ * @param {Array} [otherStack] 另一个值的堆栈。
  * @returns {boolean} 如果两个值相等，返回 `true` ，否则返回 `false` 。
  */
 declare function isEqualDeep(value: any, other: any, customizer?: Customizer, strictCheck?: boolean, valueStack?: any[], otherStack?: any[]): boolean;

package/types/lowerFirst.d.ts

@@ -12,6 +12,10 @@
  *
  * lowerFirst('BAR'); // 'bAR'
  *
+ * lowerFirst('--Foo-bar--'); // '--Foo-bar--' 不进行分词处理
+ *
+ * lowerFirst('Foo-bar'); // 'foo-bar'
+ *
  */
 declare const lowerFirst: (string: string) => string;
 export default lowerFirst;

package/types/upperFirst.d.ts

@@ -12,6 +12,10 @@
  *
  * upperFirst('BAR'); // 'BAR'
  *
+ * lowerFirst('--foo-bar--'); // '--foo-bar--' 不进行分词处理
+ *
+ * lowerFirst('foo-bar'); // 'Foo-bar'
+ *
  */
 declare const upperFirst: (string: string) => string;
 export default upperFirst;