ut2 1.5.5 → 1.6.0

package/es/merge.js

@@ -2,36 +2,46 @@ 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(); }
+function baseMerge(object, source, customizer, stack) {
+    if (stack === void 0) { stack = new WeakMap(); }
     var obj = Object(object);
     if (!isObject(source) || obj === source) {
         return obj;
     }
     var keys = allKeysIn(source);
+    var hasCustomizer = typeof customizer === 'function';
     keys.forEach(function (key) {
         var srcValue = source[key];
-        var newValue = typeof customizer === 'function' ? customizer(obj[key], srcValue, key, obj, source) : undefined;
-        if (newValue === undefined) {
-            newValue = srcValue;
-        }
-        if (isObjectLike(newValue) && key in obj && !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 : {};
-            }
-            obj[key] = baseMerge(newObjValue, newValue, customizer, storage);
+        var srcIsObj = isObject(srcValue);
+        if (srcIsObj && stack.has(srcValue)) {
+            obj[key] = srcValue;
         }
         else {
-            if (newValue !== undefined || (newValue === undefined && !(key in obj))) {
+            var newValue = hasCustomizer ? customizer(obj[key], srcValue, key, obj, source) : undefined;
+            if (newValue !== undefined) {
                 obj[key] = newValue;
             }
+            else {
+                var objValue = obj[key];
+                var newObjValue = void 0;
+                if (srcIsObj) {
+                    stack.set(srcValue, true);
+                    if (isArray(srcValue)) {
+                        newObjValue = isArray(objValue) ? objValue : [];
+                    }
+                    else if (isPlainObject(srcValue)) {
+                        newObjValue = isObjectLike(objValue) ? objValue : {};
+                    }
+                }
+                if (newObjValue) {
+                    obj[key] = baseMerge(newObjValue, srcValue, customizer, stack);
+                }
+                else if (srcValue !== undefined || !(key in obj)) {
+                    obj[key] = srcValue;
+                }
+            }
         }
     });
     return obj;

package/es/range.js

@@ -0,0 +1,28 @@
+import { mathMax, mathCeil } from './internals/native.js';
+import isNil from './isNil.js';
+import toFinite from './toFinite.js';
+
+function range(start, end, step) {
+    start = toFinite(start);
+    if (isNil(end)) {
+        end = start;
+        start = 0;
+    }
+    else {
+        end = toFinite(end);
+    }
+    step = toFinite(step);
+    if (!step) {
+        step = start < end ? 1 : -1;
+    }
+    var index = -1;
+    var length = mathMax(mathCeil((end - start) / step), 0);
+    var result = Array(length);
+    while (length--) {
+        result[++index] = start;
+        start += step;
+    }
+    return result;
+}
+
+export { range as default };

package/es/toString.js

@@ -9,7 +9,7 @@ function baseToString(value) {
         return value;
     }
     if (isArray(value)) {
-        return "".concat(value.map(baseToString));
+        return '' + value.map(baseToString);
     }
     if (isSymbol(value)) {
         return symbolToString ? symbolToString.call(value) : '';

package/lib/index.js

@@ -104,6 +104,7 @@ var lt = require('./lt.js');
 var lte = require('./lte.js');
 var noop = require('./noop.js');
 var nthArg = require('./nthArg.js');
+var range = require('./range.js');
 var sleep = require('./sleep.js');
 var times = require('./times.js');
 var toFinite = require('./toFinite.js');
@@ -222,6 +223,7 @@ exports.lt = lt;
 exports.lte = lte;
 exports.noop = noop;
 exports.nthArg = nthArg;
+exports.range = range;
 exports.sleep = sleep;
 exports.times = times;
 exports.toFinite = toFinite;

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.6.0";
 exports.supportedArgumentsType = getTag((function () { return arguments; })()) === native.argumentsTag;
 exports.FUNC_ERROR_TEXT = 'Expected a function';
 function toSource(func) {

package/lib/merge.js

@@ -4,36 +4,46 @@ 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(); }
+function baseMerge(object, source, customizer, stack) {
+    if (stack === void 0) { stack = new WeakMap(); }
     var obj = Object(object);
     if (!isObject(source) || obj === source) {
         return obj;
     }
     var keys = allKeysIn(source);
+    var hasCustomizer = typeof customizer === 'function';
     keys.forEach(function (key) {
         var srcValue = source[key];
-        var newValue = typeof customizer === 'function' ? customizer(obj[key], srcValue, key, obj, source) : undefined;
-        if (newValue === undefined) {
-            newValue = srcValue;
-        }
-        if (isObjectLike(newValue) && key in obj && !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 : {};
-            }
-            obj[key] = baseMerge(newObjValue, newValue, customizer, storage);
+        var srcIsObj = isObject(srcValue);
+        if (srcIsObj && stack.has(srcValue)) {
+            obj[key] = srcValue;
         }
         else {
-            if (newValue !== undefined || (newValue === undefined && !(key in obj))) {
+            var newValue = hasCustomizer ? customizer(obj[key], srcValue, key, obj, source) : undefined;
+            if (newValue !== undefined) {
                 obj[key] = newValue;
             }
+            else {
+                var objValue = obj[key];
+                var newObjValue = void 0;
+                if (srcIsObj) {
+                    stack.set(srcValue, true);
+                    if (isArray(srcValue)) {
+                        newObjValue = isArray(objValue) ? objValue : [];
+                    }
+                    else if (isPlainObject(srcValue)) {
+                        newObjValue = isObjectLike(objValue) ? objValue : {};
+                    }
+                }
+                if (newObjValue) {
+                    obj[key] = baseMerge(newObjValue, srcValue, customizer, stack);
+                }
+                else if (srcValue !== undefined || !(key in obj)) {
+                    obj[key] = srcValue;
+                }
+            }
         }
     });
     return obj;

package/lib/range.js

@@ -0,0 +1,30 @@
+'use strict';
+
+var native = require('./internals/native.js');
+var isNil = require('./isNil.js');
+var toFinite = require('./toFinite.js');
+
+function range(start, end, step) {
+    start = toFinite(start);
+    if (isNil(end)) {
+        end = start;
+        start = 0;
+    }
+    else {
+        end = toFinite(end);
+    }
+    step = toFinite(step);
+    if (!step) {
+        step = start < end ? 1 : -1;
+    }
+    var index = -1;
+    var length = native.mathMax(native.mathCeil((end - start) / step), 0);
+    var result = Array(length);
+    while (length--) {
+        result[++index] = start;
+        start += step;
+    }
+    return result;
+}
+
+module.exports = range;

package/lib/toString.js

@@ -11,7 +11,7 @@ function baseToString(value) {
         return value;
     }
     if (isArray(value)) {
-        return "".concat(value.map(baseToString));
+        return '' + value.map(baseToString);
     }
     if (isSymbol(value)) {
         return symbolToString ? symbolToString.call(value) : '';

package/package.json

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

package/types/index.d.ts

@@ -156,6 +156,7 @@ export { default as lt } from './lt';
 export { default as lte } from './lte';
 export { default as noop } from './noop';
 export { default as nthArg } from './nthArg';
+export { default as range } from './range';
 export { default as sleep } from './sleep';
 export { default as times } from './times';
 export { default as toFinite } from './toFinite';

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/range.d.ts

@@ -0,0 +1,4 @@
+declare function range(start: number, end: number, step: number): number[];
+declare function range(start: number, end: number): number[];
+declare function range(end: number): number[];
+export default range;

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;