ut2 1.5.5 → 1.5.6

package/lib/internals/helpers.js

@@ -3,7 +3,7 @@
 var getTag = require('./getTag.js');
 var native = require('./native.js');
 
-exports.VERSION = "1.5.5";
+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/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/package.json

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

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;