diff --git a/README.md b/README.md index f5be76457..b7ce5be9a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# lodash-es v3.6.0 +# lodash-es v3.7.0 The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash](https://lodash.com/) exported as [ES](https://people.mozilla.org/~jorendorff/es6-draft.html) modules. @@ -7,4 +7,4 @@ Generated using [lodash-cli](https://www.npmjs.com/package/lodash-cli): $ lodash modularize modern exports=es -o ./ ``` -See the [package source](https://github.com/lodash/lodash/tree/3.6.0-es) for more details. +See the [package source](https://github.com/lodash/lodash/tree/3.7.0-es) for more details. diff --git a/array/intersection.js b/array/intersection.js index d94ea5dc0..018f356a4 100644 --- a/array/intersection.js +++ b/array/intersection.js @@ -27,7 +27,8 @@ function intersection() { argsLength = arguments.length, caches = [], indexOf = baseIndexOf, - isCommon = true; + isCommon = true, + result = []; while (++argsIndex < argsLength) { var value = arguments[argsIndex]; @@ -37,10 +38,12 @@ function intersection() { } } argsLength = args.length; + if (argsLength < 2) { + return result; + } var array = args[0], index = -1, length = array ? array.length : 0, - result = [], seen = caches[0]; outer: diff --git a/array/pullAt.js b/array/pullAt.js index 5af9d7046..3299c9869 100644 --- a/array/pullAt.js +++ b/array/pullAt.js @@ -1,15 +1,9 @@ import baseAt from '../internal/baseAt'; import baseCompareAscending from '../internal/baseCompareAscending'; import baseFlatten from '../internal/baseFlatten'; -import isIndex from '../internal/isIndex'; +import basePullAt from '../internal/basePullAt'; import restParam from '../function/restParam'; -/** Used for native method references. */ -var arrayProto = Array.prototype; - -/** Native method references. */ -var splice = arrayProto.splice; - /** * Removes elements from `array` corresponding to the given indexes and returns * an array of the removed elements. Indexes may be specified as an array of @@ -39,17 +33,8 @@ var pullAt = restParam(function(array, indexes) { array || (array = []); indexes = baseFlatten(indexes); - var length = indexes.length, - result = baseAt(array, indexes); - - indexes.sort(baseCompareAscending); - while (length--) { - var index = parseFloat(indexes[length]); - if (index != previous && isIndex(index)) { - var previous = index; - splice.call(array, index, 1); - } - } + var result = baseAt(array, indexes); + basePullAt(array, indexes.sort(baseCompareAscending)); return result; }); diff --git a/array/remove.js b/array/remove.js index 5109d69f8..3a03a931c 100644 --- a/array/remove.js +++ b/array/remove.js @@ -1,10 +1,5 @@ import baseCallback from '../internal/baseCallback'; - -/** Used for native method references. */ -var arrayProto = Array.prototype; - -/** Native method references. */ -var splice = arrayProto.splice; +import basePullAt from '../internal/basePullAt'; /** * Removes all elements from `array` that `predicate` returns truthy for @@ -46,19 +41,23 @@ var splice = arrayProto.splice; * // => [2, 4] */ function remove(array, predicate, thisArg) { + var result = []; + if (!(array && array.length)) { + return result; + } var index = -1, - length = array ? array.length : 0, - result = []; + indexes = [], + length = array.length; predicate = baseCallback(predicate, thisArg, 3); while (++index < length) { var value = array[index]; if (predicate(value, index, array)) { result.push(value); - splice.call(array, index--, 1); - length--; + indexes.push(index); } } + basePullAt(array, indexes); return result; } diff --git a/array/slice.js b/array/slice.js index 7a3eef56a..0fe0b64e9 100644 --- a/array/slice.js +++ b/array/slice.js @@ -4,7 +4,7 @@ import isIterateeCall from '../internal/isIterateeCall'; /** * Creates a slice of `array` from `start` up to, but not including, `end`. * - * **Note:** This function is used instead of `Array#slice` to support node + * **Note:** This method is used instead of `Array#slice` to support node * lists in IE < 9 and to ensure dense arrays are returned. * * @static diff --git a/array/uniq.js b/array/uniq.js index e1972b5d7..02c333459 100644 --- a/array/uniq.js +++ b/array/uniq.js @@ -4,12 +4,13 @@ import isIterateeCall from '../internal/isIterateeCall'; import sortedUniq from '../internal/sortedUniq'; /** - * Creates a duplicate-value-free version of an array using `SameValueZero` - * for equality comparisons. Providing `true` for `isSorted` performs a faster - * search algorithm for sorted arrays. If an iteratee function is provided it - * is invoked for each value in the array to generate the criterion by which - * uniqueness is computed. The `iteratee` is bound to `thisArg` and invoked - * with three arguments: (value, index, array). + * Creates a duplicate-free version of an array, using `SameValueZero` for + * equality comparisons, in which only the first occurence of each element + * is kept. Providing `true` for `isSorted` performs a faster search algorithm + * for sorted arrays. If an iteratee function is provided it is invoked for + * each element in the array to generate the criterion by which uniqueness + * is computed. The `iteratee` is bound to `thisArg` and invoked with three + * arguments: (value, index, array). * * If a property name is provided for `iteratee` the created `_.property` * style callback returns the property value of the given element. @@ -37,8 +38,8 @@ import sortedUniq from '../internal/sortedUniq'; * @returns {Array} Returns the new duplicate-value-free array. * @example * - * _.uniq([1, 2, 1]); - * // => [1, 2] + * _.uniq([2, 1, 2]); + * // => [2, 1] * * // using `isSorted` * _.uniq([1, 1, 2], true); diff --git a/array/unzip.js b/array/unzip.js index dfdb4701c..658d8fe58 100644 --- a/array/unzip.js +++ b/array/unzip.js @@ -1,9 +1,7 @@ import arrayMap from '../internal/arrayMap'; import arrayMax from '../internal/arrayMax'; import baseProperty from '../internal/baseProperty'; - -/** Used to the length of n-tuples for `_.unzip`. */ -var getLength = baseProperty('length'); +import getLength from '../internal/getLength'; /** * This method is like `_.zip` except that it accepts an array of grouped diff --git a/chain/lodash.js b/chain/lodash.js index e017f806e..9be09bdaa 100644 --- a/chain/lodash.js +++ b/chain/lodash.js @@ -50,8 +50,8 @@ var hasOwnProperty = objectProto.hasOwnProperty; * `filter`, `flatten`, `flattenDeep`, `flow`, `flowRight`, `forEach`, * `forEachRight`, `forIn`, `forInRight`, `forOwn`, `forOwnRight`, `functions`, * `groupBy`, `indexBy`, `initial`, `intersection`, `invert`, `invoke`, `keys`, - * `keysIn`, `map`, `mapValues`, `matches`, `matchesProperty`, `memoize`, `merge`, - * `mixin`, `negate`, `noop`, `omit`, `once`, `pairs`, `partial`, `partialRight`, + * `keysIn`, `map`, `mapValues`, `matches`, `matchesProperty`, `memoize`, + * `merge`, `mixin`, `negate`, `omit`, `once`, `pairs`, `partial`, `partialRight`, * `partition`, `pick`, `plant`, `pluck`, `property`, `propertyOf`, `pull`, * `pullAt`, `push`, `range`, `rearg`, `reject`, `remove`, `rest`, `reverse`, * `shuffle`, `slice`, `sort`, `sortBy`, `sortByAll`, `sortByOrder`, `splice`, @@ -65,15 +65,15 @@ var hasOwnProperty = objectProto.hasOwnProperty; * `endsWith`, `escape`, `escapeRegExp`, `every`, `find`, `findIndex`, `findKey`, * `findLast`, `findLastIndex`, `findLastKey`, `findWhere`, `first`, `has`, * `identity`, `includes`, `indexOf`, `inRange`, `isArguments`, `isArray`, - * `isBoolean`, `isDate`, `isElement`, `isEmpty`, `isEqual`, `isError`, - * `isFinite`,`isFunction`, `isMatch`, `isNative`, `isNaN`, `isNull`, `isNumber`, - * `isObject`, `isPlainObject`, `isRegExp`, `isString`, `isUndefined`, - * `isTypedArray`, `join`, `kebabCase`, `last`, `lastIndexOf`, `max`, `min`, - * `noConflict`, `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`, - * `random`, `reduce`, `reduceRight`, `repeat`, `result`, `runInContext`, - * `shift`, `size`, `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`, - * `startCase`, `startsWith`, `sum`, `template`, `trim`, `trimLeft`, - * `trimRight`, `trunc`, `unescape`, `uniqueId`, `value`, and `words` + * `isBoolean`, `isDate`, `isElement`, `isEmpty`, `isEqual`, `isError`, `isFinite` + * `isFunction`, `isMatch`, `isNative`, `isNaN`, `isNull`, `isNumber`, `isObject`, + * `isPlainObject`, `isRegExp`, `isString`, `isUndefined`, `isTypedArray`, + * `join`, `kebabCase`, `last`, `lastIndexOf`, `max`, `min`, `noConflict`, + * `noop`, `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`, `random`, + * `reduce`, `reduceRight`, `repeat`, `result`, `runInContext`, `shift`, `size`, + * `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`, `startCase`, `startsWith`, + * `sum`, `template`, `trim`, `trimLeft`, `trimRight`, `trunc`, `unescape`, + * `uniqueId`, `value`, and `words` * * The wrapper method `sample` will return a wrapped value when `n` is provided, * otherwise an unwrapped value is returned. @@ -88,8 +88,8 @@ var hasOwnProperty = objectProto.hasOwnProperty; * var wrapped = _([1, 2, 3]); * * // returns an unwrapped value - * wrapped.reduce(function(sum, n) { - * return sum + n; + * wrapped.reduce(function(total, n) { + * return total + n; * }); * // => 6 * diff --git a/collection/at.js b/collection/at.js index e63052e1d..2e4ef4598 100644 --- a/collection/at.js +++ b/collection/at.js @@ -1,5 +1,6 @@ import baseAt from '../internal/baseAt'; import baseFlatten from '../internal/baseFlatten'; +import getLength from '../internal/getLength'; import isLength from '../internal/isLength'; import restParam from '../function/restParam'; import toIterable from '../internal/toIterable'; @@ -25,7 +26,7 @@ import toIterable from '../internal/toIterable'; * // => ['barney', 'pebbles'] */ var at = restParam(function(collection, props) { - var length = collection ? collection.length : 0; + var length = collection ? getLength(collection) : 0; if (isLength(length)) { collection = toIterable(collection); } diff --git a/collection/every.js b/collection/every.js index 1ebe85943..89fe06b6c 100644 --- a/collection/every.js +++ b/collection/every.js @@ -57,7 +57,7 @@ function every(collection, predicate, thisArg) { if (thisArg && isIterateeCall(collection, predicate, thisArg)) { predicate = null; } - if (typeof predicate != 'function' || typeof thisArg != 'undefined') { + if (typeof predicate != 'function' || thisArg !== undefined) { predicate = baseCallback(predicate, thisArg, 3); } return func(collection, predicate); diff --git a/collection/forEach.js b/collection/forEach.js index acee0c8d0..8202a9ac2 100644 --- a/collection/forEach.js +++ b/collection/forEach.js @@ -5,10 +5,10 @@ import createForEach from '../internal/createForEach'; /** * Iterates over elements of `collection` invoking `iteratee` for each element. * The `iteratee` is bound to `thisArg` and invoked with three arguments: - * (value, index|key, collection). Iterator functions may exit iteration early + * (value, index|key, collection). Iteratee functions may exit iteration early * by explicitly returning `false`. * - * **Note:** As with other "Collections" methods, objects with a `length` property + * **Note:** As with other "Collections" methods, objects with a "length" property * are iterated like arrays. To avoid this behavior `_.forIn` or `_.forOwn` * may be used for object iteration. * diff --git a/collection/includes.js b/collection/includes.js index 2221ebf4e..1fdc04c17 100644 --- a/collection/includes.js +++ b/collection/includes.js @@ -1,4 +1,5 @@ import baseIndexOf from '../internal/baseIndexOf'; +import getLength from '../internal/getLength'; import isArray from '../lang/isArray'; import isIterateeCall from '../internal/isIterateeCall'; import isLength from '../internal/isLength'; @@ -41,7 +42,7 @@ var nativeMax = Math.max; * // => true */ function includes(collection, target, fromIndex, guard) { - var length = collection ? collection.length : 0; + var length = collection ? getLength(collection) : 0; if (!isLength(length)) { collection = values(collection); length = collection.length; diff --git a/collection/invoke.js b/collection/invoke.js index 5cdc5a21c..341f6706d 100644 --- a/collection/invoke.js +++ b/collection/invoke.js @@ -1,18 +1,21 @@ import baseEach from '../internal/baseEach'; +import getLength from '../internal/getLength'; +import invokePath from '../internal/invokePath'; +import isKey from '../internal/isKey'; import isLength from '../internal/isLength'; import restParam from '../function/restParam'; /** - * Invokes the method named by `methodName` on each element in `collection`, - * returning an array of the results of each invoked method. Any additional - * arguments are provided to each invoked method. If `methodName` is a function - * it is invoked for, and `this` bound to, each element in `collection`. + * Invokes the method at `path` on each element in `collection`, returning + * an array of the results of each invoked method. Any additional arguments + * are provided to each invoked method. If `methodName` is a function it is + * invoked for, and `this` bound to, each element in `collection`. * * @static * @memberOf _ * @category Collection * @param {Array|Object|string} collection The collection to iterate over. - * @param {Function|string} methodName The name of the method to invoke or + * @param {Array|Function|string} path The path of the method to invoke or * the function invoked per iteration. * @param {...*} [args] The arguments to invoke the method with. * @returns {Array} Returns the array of results. @@ -24,15 +27,16 @@ import restParam from '../function/restParam'; * _.invoke([123, 456], String.prototype.split, ''); * // => [['1', '2', '3'], ['4', '5', '6']] */ -var invoke = restParam(function(collection, methodName, args) { +var invoke = restParam(function(collection, path, args) { var index = -1, - isFunc = typeof methodName == 'function', - length = collection ? collection.length : 0, + isFunc = typeof path == 'function', + isProp = isKey(path), + length = getLength(collection), result = isLength(length) ? Array(length) : []; baseEach(collection, function(value) { - var func = isFunc ? methodName : (value != null && value[methodName]); - result[++index] = func ? func.apply(value, args) : undefined; + var func = isFunc ? path : (isProp && value != null && value[path]); + result[++index] = func ? func.apply(value, args) : invokePath(value, path, args); }); return result; }); diff --git a/collection/map.js b/collection/map.js index fb8504c7a..63630190e 100644 --- a/collection/map.js +++ b/collection/map.js @@ -35,7 +35,6 @@ import isArray from '../lang/isArray'; * @param {Array|Object|string} collection The collection to iterate over. * @param {Function|Object|string} [iteratee=_.identity] The function invoked * per iteration. - * create a `_.property` or `_.matches` style callback respectively. * @param {*} [thisArg] The `this` binding of `iteratee`. * @returns {Array} Returns the new mapped array. * @example diff --git a/collection/pluck.js b/collection/pluck.js index 805b96352..ffc64c861 100644 --- a/collection/pluck.js +++ b/collection/pluck.js @@ -1,14 +1,14 @@ -import baseProperty from '../internal/baseProperty'; import map from './map'; +import property from '../utility/property'; /** - * Gets the value of `key` from all elements in `collection`. + * Gets the property value of `path` from all elements in `collection`. * * @static * @memberOf _ * @category Collection * @param {Array|Object|string} collection The collection to iterate over. - * @param {string} key The key of the property to pluck. + * @param {Array|string} path The path of the property to pluck. * @returns {Array} Returns the property values. * @example * @@ -24,8 +24,8 @@ import map from './map'; * _.pluck(userIndex, 'age'); * // => [36, 40] (iteration order is not guaranteed) */ -function pluck(collection, key) { - return map(collection, baseProperty(key)); +function pluck(collection, path) { + return map(collection, property(path)); } export default pluck; diff --git a/collection/reduce.js b/collection/reduce.js index 55721e311..fbf01eaa9 100644 --- a/collection/reduce.js +++ b/collection/reduce.js @@ -27,8 +27,8 @@ import createReduce from '../internal/createReduce'; * @returns {*} Returns the accumulated value. * @example * - * _.reduce([1, 2], function(sum, n) { - * return sum + n; + * _.reduce([1, 2], function(total, n) { + * return total + n; * }); * // => 3 * diff --git a/collection/size.js b/collection/size.js index 60816e9f9..cb386c7c0 100644 --- a/collection/size.js +++ b/collection/size.js @@ -1,3 +1,4 @@ +import getLength from '../internal/getLength'; import isLength from '../internal/isLength'; import keys from '../object/keys'; @@ -22,7 +23,7 @@ import keys from '../object/keys'; * // => 7 */ function size(collection) { - var length = collection ? collection.length : 0; + var length = collection ? getLength(collection) : 0; return isLength(length) ? length : keys(collection).length; } diff --git a/collection/some.js b/collection/some.js index 8e848c42e..684f551a7 100644 --- a/collection/some.js +++ b/collection/some.js @@ -58,7 +58,7 @@ function some(collection, predicate, thisArg) { if (thisArg && isIterateeCall(collection, predicate, thisArg)) { predicate = null; } - if (typeof predicate != 'function' || typeof thisArg != 'undefined') { + if (typeof predicate != 'function' || thisArg !== undefined) { predicate = baseCallback(predicate, thisArg, 3); } return func(collection, predicate); diff --git a/collection/sortBy.js b/collection/sortBy.js index 0a114a6f7..647756d08 100644 --- a/collection/sortBy.js +++ b/collection/sortBy.js @@ -1,9 +1,8 @@ import baseCallback from '../internal/baseCallback'; -import baseEach from '../internal/baseEach'; +import baseMap from '../internal/baseMap'; import baseSortBy from '../internal/baseSortBy'; import compareAscending from '../internal/compareAscending'; import isIterateeCall from '../internal/isIterateeCall'; -import isLength from '../internal/isLength'; /** * Creates an array of elements, sorted in ascending order by the results of @@ -27,9 +26,8 @@ import isLength from '../internal/isLength'; * @memberOf _ * @category Collection * @param {Array|Object|string} collection The collection to iterate over. - * @param {Array|Function|Object|string} [iteratee=_.identity] The function - * invoked per iteration. If a property name or an object is provided it is - * used to create a `_.property` or `_.matches` style callback respectively. + * @param {Function|Object|string} [iteratee=_.identity] The function invoked + * per iteration. * @param {*} [thisArg] The `this` binding of `iteratee`. * @returns {Array} Returns the new sorted array. * @example @@ -58,16 +56,14 @@ function sortBy(collection, iteratee, thisArg) { if (collection == null) { return []; } - var index = -1, - length = collection.length, - result = isLength(length) ? Array(length) : []; - if (thisArg && isIterateeCall(collection, iteratee, thisArg)) { iteratee = null; } + var index = -1; iteratee = baseCallback(iteratee, thisArg, 3); - baseEach(collection, function(value, key, collection) { - result[++index] = { 'criteria': iteratee(value, key, collection), 'index': index, 'value': value }; + + var result = baseMap(collection, function(value, key, collection) { + return { 'criteria': iteratee(value, key, collection), 'index': ++index, 'value': value }; }); return baseSortBy(result, compareAscending); } diff --git a/collection/sortByAll.js b/collection/sortByAll.js index 7f5a12715..49bb71141 100644 --- a/collection/sortByAll.js +++ b/collection/sortByAll.js @@ -1,48 +1,52 @@ import baseFlatten from '../internal/baseFlatten'; import baseSortByOrder from '../internal/baseSortByOrder'; import isIterateeCall from '../internal/isIterateeCall'; +import restParam from '../function/restParam'; /** - * This method is like `_.sortBy` except that it sorts by property names - * instead of an iteratee function. + * This method is like `_.sortBy` except that it can sort by multiple iteratees + * or property names. + * + * If a property name is provided for an iteratee the created `_.property` + * style callback returns the property value of the given element. + * + * If an object is provided for an iteratee the created `_.matches` style + * callback returns `true` for elements that have the properties of the given + * object, else `false`. * * @static * @memberOf _ * @category Collection * @param {Array|Object|string} collection The collection to iterate over. - * @param {...(string|string[])} props The property names to sort by, - * specified as individual property names or arrays of property names. + * @param {...(Function|Function[]|Object|Object[]|string|string[])} iteratees + * The iteratees to sort by, specified as individual values or arrays of values. * @returns {Array} Returns the new sorted array. * @example * * var users = [ + * { 'user': 'fred', 'age': 48 }, * { 'user': 'barney', 'age': 36 }, - * { 'user': 'fred', 'age': 40 }, - * { 'user': 'barney', 'age': 26 }, - * { 'user': 'fred', 'age': 30 } + * { 'user': 'fred', 'age': 42 }, + * { 'user': 'barney', 'age': 34 } * ]; * * _.map(_.sortByAll(users, ['user', 'age']), _.values); - * // => [['barney', 26], ['barney', 36], ['fred', 30], ['fred', 40]] + * // => [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]] + * + * _.map(_.sortByAll(users, 'user', function(chr) { + * return Math.floor(chr.age / 10); + * }), _.values); + * // => [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]] */ -function sortByAll() { - var args = arguments, - collection = args[0], - guard = args[3], - index = 0, - length = args.length - 1; - +var sortByAll = restParam(function(collection, iteratees) { if (collection == null) { return []; } - var props = Array(length); - while (index < length) { - props[index] = args[++index]; + var guard = iteratees[2]; + if (guard && isIterateeCall(iteratees[0], iteratees[1], guard)) { + iteratees.length = 1; } - if (guard && isIterateeCall(args[1], args[2], guard)) { - props = args[1]; - } - return baseSortByOrder(collection, baseFlatten(props), []); -} + return baseSortByOrder(collection, baseFlatten(iteratees), []); +}); export default sortByAll; diff --git a/collection/sortByOrder.js b/collection/sortByOrder.js index 9f1bde702..510cf5daf 100644 --- a/collection/sortByOrder.js +++ b/collection/sortByOrder.js @@ -4,45 +4,52 @@ import isIterateeCall from '../internal/isIterateeCall'; /** * This method is like `_.sortByAll` except that it allows specifying the - * sort orders of the property names to sort by. A truthy value in `orders` - * will sort the corresponding property name in ascending order while a - * falsey value will sort it in descending order. + * sort orders of the iteratees to sort by. A truthy value in `orders` will + * sort the corresponding property name in ascending order while a falsey + * value will sort it in descending order. + * + * If a property name is provided for an iteratee the created `_.property` + * style callback returns the property value of the given element. + * + * If an object is provided for an iteratee the created `_.matches` style + * callback returns `true` for elements that have the properties of the given + * object, else `false`. * * @static * @memberOf _ * @category Collection * @param {Array|Object|string} collection The collection to iterate over. - * @param {string[]} props The property names to sort by. - * @param {boolean[]} orders The sort orders of `props`. + * @param {Function[]|Object[]|string[]} iteratees The iteratees to sort by. + * @param {boolean[]} orders The sort orders of `iteratees`. * @param- {Object} [guard] Enables use as a callback for functions like `_.reduce`. * @returns {Array} Returns the new sorted array. * @example * * var users = [ - * { 'user': 'barney', 'age': 26 }, - * { 'user': 'fred', 'age': 40 }, - * { 'user': 'barney', 'age': 36 }, - * { 'user': 'fred', 'age': 30 } + * { 'user': 'fred', 'age': 48 }, + * { 'user': 'barney', 'age': 34 }, + * { 'user': 'fred', 'age': 42 }, + * { 'user': 'barney', 'age': 36 } * ]; * * // sort by `user` in ascending order and by `age` in descending order * _.map(_.sortByOrder(users, ['user', 'age'], [true, false]), _.values); - * // => [['barney', 36], ['barney', 26], ['fred', 40], ['fred', 30]] + * // => [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]] */ -function sortByOrder(collection, props, orders, guard) { +function sortByOrder(collection, iteratees, orders, guard) { if (collection == null) { return []; } - if (guard && isIterateeCall(props, orders, guard)) { + if (guard && isIterateeCall(iteratees, orders, guard)) { orders = null; } - if (!isArray(props)) { - props = props == null ? [] : [props]; + if (!isArray(iteratees)) { + iteratees = iteratees == null ? [] : [iteratees]; } if (!isArray(orders)) { orders = orders == null ? [] : [orders]; } - return baseSortByOrder(collection, props, orders); + return baseSortByOrder(collection, iteratees, orders); } export default sortByOrder; diff --git a/function/before.js b/function/before.js index 40af146e7..7f2266ebb 100644 --- a/function/before.js +++ b/function/before.js @@ -31,7 +31,8 @@ function before(n, func) { return function() { if (--n > 0) { result = func.apply(this, arguments); - } else { + } + if (n <= 1) { func = null; } return result; diff --git a/function/bind.js b/function/bind.js index 88c896da3..fe0adb9e8 100644 --- a/function/bind.js +++ b/function/bind.js @@ -14,7 +14,7 @@ var BIND_FLAG = 1, * The `_.bind.placeholder` value, which defaults to `_` in monolithic builds, * may be used as a placeholder for partially applied arguments. * - * **Note:** Unlike native `Function#bind` this method does not set the `length` + * **Note:** Unlike native `Function#bind` this method does not set the "length" * property of bound functions. * * @static diff --git a/function/bindAll.js b/function/bindAll.js index d446ae48e..2346f6349 100644 --- a/function/bindAll.js +++ b/function/bindAll.js @@ -12,7 +12,7 @@ var BIND_FLAG = 1; * of method names. If no method names are provided all enumerable function * properties, own and inherited, of `object` are bound. * - * **Note:** This method does not set the `length` property of bound functions. + * **Note:** This method does not set the "length" property of bound functions. * * @static * @memberOf _ diff --git a/function/bindKey.js b/function/bindKey.js index c641f90af..20c6a4441 100644 --- a/function/bindKey.js +++ b/function/bindKey.js @@ -13,7 +13,7 @@ var BIND_FLAG = 1, * * This method differs from `_.bind` by allowing bound functions to reference * methods that may be redefined or don't yet exist. - * See [Peter Michaux's article](http://michaux.ca/articles/lazy-function-definition-pattern) + * See [Peter Michaux's article](http://peter.michaux.ca/articles/lazy-function-definition-pattern) * for more details. * * The `_.bindKey.placeholder` value, which defaults to `_` in monolithic diff --git a/function/curry.js b/function/curry.js index 6936ca34a..fd170a5ff 100644 --- a/function/curry.js +++ b/function/curry.js @@ -13,7 +13,7 @@ var CURRY_FLAG = 8; * The `_.curry.placeholder` value, which defaults to `_` in monolithic builds, * may be used as a placeholder for provided arguments. * - * **Note:** This method does not set the `length` property of curried functions. + * **Note:** This method does not set the "length" property of curried functions. * * @static * @memberOf _ diff --git a/function/curryRight.js b/function/curryRight.js index 527d06b9a..8cd0edac0 100644 --- a/function/curryRight.js +++ b/function/curryRight.js @@ -10,7 +10,7 @@ var CURRY_RIGHT_FLAG = 16; * The `_.curryRight.placeholder` value, which defaults to `_` in monolithic * builds, may be used as a placeholder for provided arguments. * - * **Note:** This method does not set the `length` property of curried functions. + * **Note:** This method does not set the "length" property of curried functions. * * @static * @memberOf _ diff --git a/function/once.js b/function/once.js index 464b00a34..d09ae01ea 100644 --- a/function/once.js +++ b/function/once.js @@ -18,7 +18,7 @@ import before from './before'; * // `initialize` invokes `createApplication` once */ function once(func) { - return before(func, 2); + return before(2, func); } export default once; diff --git a/function/partial.js b/function/partial.js index 26c7755ab..4cbdb839a 100644 --- a/function/partial.js +++ b/function/partial.js @@ -11,7 +11,7 @@ var PARTIAL_FLAG = 32; * The `_.partial.placeholder` value, which defaults to `_` in monolithic * builds, may be used as a placeholder for partially applied arguments. * - * **Note:** This method does not set the `length` property of partially + * **Note:** This method does not set the "length" property of partially * applied functions. * * @static diff --git a/function/partialRight.js b/function/partialRight.js index 319ccee73..496c46ef9 100644 --- a/function/partialRight.js +++ b/function/partialRight.js @@ -10,7 +10,7 @@ var PARTIAL_RIGHT_FLAG = 64; * The `_.partialRight.placeholder` value, which defaults to `_` in monolithic * builds, may be used as a placeholder for partially applied arguments. * - * **Note:** This method does not set the `length` property of partially + * **Note:** This method does not set the "length" property of partially * applied functions. * * @static diff --git a/function/restParam.js b/function/restParam.js index fecb65a31..8efcbf27c 100644 --- a/function/restParam.js +++ b/function/restParam.js @@ -30,7 +30,7 @@ function restParam(func, start) { if (typeof func != 'function') { throw new TypeError(FUNC_ERROR_TEXT); } - start = nativeMax(typeof start == 'undefined' ? (func.length - 1) : (+start || 0), 0); + start = nativeMax(start === undefined ? (func.length - 1) : (+start || 0), 0); return function() { var args = arguments, index = -1, diff --git a/internal/assignDefaults.js b/internal/assignDefaults.js index 6f37a2b57..f91ee0b41 100644 --- a/internal/assignDefaults.js +++ b/internal/assignDefaults.js @@ -7,7 +7,7 @@ * @returns {*} Returns the value to assign to the destination object. */ function assignDefaults(objectValue, sourceValue) { - return typeof objectValue == 'undefined' ? sourceValue : objectValue; + return objectValue === undefined ? sourceValue : objectValue; } export default assignDefaults; diff --git a/internal/assignOwnDefaults.js b/internal/assignOwnDefaults.js index 8111ed1ef..5cd1af27f 100644 --- a/internal/assignOwnDefaults.js +++ b/internal/assignOwnDefaults.js @@ -7,7 +7,7 @@ var hasOwnProperty = objectProto.hasOwnProperty; /** * Used by `_.template` to customize its `_.assign` use. * - * **Note:** This method is like `assignDefaults` except that it ignores + * **Note:** This function is like `assignDefaults` except that it ignores * inherited property values when checking if a property is `undefined`. * * @private @@ -18,7 +18,7 @@ var hasOwnProperty = objectProto.hasOwnProperty; * @returns {*} Returns the value to assign to the destination object. */ function assignOwnDefaults(objectValue, sourceValue, key, object) { - return (typeof objectValue == 'undefined' || !hasOwnProperty.call(object, key)) + return (objectValue === undefined || !hasOwnProperty.call(object, key)) ? sourceValue : objectValue; } diff --git a/internal/assignWith.js b/internal/assignWith.js new file mode 100644 index 000000000..4f4c5711b --- /dev/null +++ b/internal/assignWith.js @@ -0,0 +1,41 @@ +import getSymbols from './getSymbols'; +import keys from '../object/keys'; + +/** Used for native method references. */ +var arrayProto = Array.prototype; + +/** Native method references. */ +var push = arrayProto.push; + +/** + * A specialized version of `_.assign` for customizing assigned values without + * support for argument juggling, multiple sources, and `this` binding `customizer` + * functions. + * + * @private + * @param {Object} object The destination object. + * @param {Object} source The source object. + * @param {Function} customizer The function to customize assigned values. + * @returns {Object} Returns `object`. + */ +function assignWith(object, source, customizer) { + var props = keys(source); + push.apply(props, getSymbols(source)); + + var index = -1, + length = props.length; + + while (++index < length) { + var key = props[index], + value = object[key], + result = customizer(value, source[key], key, object, source); + + if ((result === result ? (result !== value) : (value === value)) || + (value === undefined && !(key in object))) { + object[key] = result; + } + } + return object; +} + +export default assignWith; diff --git a/internal/baseAssign.js b/internal/baseAssign.js index 7b963761e..fb0b86696 100644 --- a/internal/baseAssign.js +++ b/internal/baseAssign.js @@ -1,35 +1,40 @@ import baseCopy from './baseCopy'; +import getSymbols from './getSymbols'; +import isNative from '../lang/isNative'; import keys from '../object/keys'; +/** Native method references. */ +var preventExtensions = isNative(Object.preventExtensions = Object.preventExtensions) && preventExtensions; + +/** Used as `baseAssign`. */ +var nativeAssign = (function() { + // Avoid `Object.assign` in Firefox 34-37 which have an early implementation + // with a now defunct try/catch behavior. See https://bugzilla.mozilla.org/show_bug.cgi?id=1103344 + // for more details. + // + // Use `Object.preventExtensions` on a plain object instead of simply using + // `Object('x')` because Chrome and IE fail to throw an error when attempting + // to assign values to readonly indexes of strings in strict mode. + var object = { '1': 0 }, + func = preventExtensions && isNative(func = Object.assign) && func; + + try { func(preventExtensions(object), 'xo'); } catch(e) {} + return !object[1] && func; +}()); + /** * The base implementation of `_.assign` without support for argument juggling, - * multiple sources, and `this` binding `customizer` functions. + * multiple sources, and `customizer` functions. * * @private * @param {Object} object The destination object. * @param {Object} source The source object. - * @param {Function} [customizer] The function to customize assigning values. - * @returns {Object} Returns the destination object. + * @returns {Object} Returns `object`. */ -function baseAssign(object, source, customizer) { - var props = keys(source); - if (!customizer) { - return baseCopy(source, object, props); - } - var index = -1, - length = props.length; - - while (++index < length) { - var key = props[index], - value = object[key], - result = customizer(value, source[key], key, object, source); - - if ((result === result ? (result !== value) : (value === value)) || - (typeof value == 'undefined' && !(key in object))) { - object[key] = result; - } - } - return object; -} +var baseAssign = nativeAssign || function(object, source) { + return source == null + ? object + : baseCopy(source, getSymbols(source), baseCopy(source, keys(source), object)); +}; export default baseAssign; diff --git a/internal/baseAt.js b/internal/baseAt.js index 99700cdd8..fe427a367 100644 --- a/internal/baseAt.js +++ b/internal/baseAt.js @@ -2,12 +2,12 @@ import isIndex from './isIndex'; import isLength from './isLength'; /** - * The base implementation of `_.at` without support for strings and individual - * key arguments. + * The base implementation of `_.at` without support for string collections + * and individual key arguments. * * @private * @param {Array|Object} collection The collection to iterate over. - * @param {number[]|string[]} [props] The property names or indexes of elements to pick. + * @param {number[]|string[]} props The property names or indexes of elements to pick. * @returns {Array} Returns the new array of picked elements. */ function baseAt(collection, props) { @@ -20,7 +20,6 @@ function baseAt(collection, props) { while(++index < propsLength) { var key = props[index]; if (isArr) { - key = parseFloat(key); result[index] = isIndex(key, length) ? collection[key] : undefined; } else { result[index] = collection[key]; diff --git a/internal/baseCallback.js b/internal/baseCallback.js index 2f74b7947..1d05a5ffd 100644 --- a/internal/baseCallback.js +++ b/internal/baseCallback.js @@ -1,8 +1,8 @@ import baseMatches from './baseMatches'; import baseMatchesProperty from './baseMatchesProperty'; -import baseProperty from './baseProperty'; import bindCallback from './bindCallback'; import identity from '../utility/identity'; +import property from '../utility/property'; /** * The base implementation of `_.callback` which supports specifying the @@ -17,7 +17,7 @@ import identity from '../utility/identity'; function baseCallback(func, thisArg, argCount) { var type = typeof func; if (type == 'function') { - return typeof thisArg == 'undefined' + return thisArg === undefined ? func : bindCallback(func, thisArg, argCount); } @@ -27,9 +27,9 @@ function baseCallback(func, thisArg, argCount) { if (type == 'object') { return baseMatches(func); } - return typeof thisArg == 'undefined' - ? baseProperty(func + '') - : baseMatchesProperty(func + '', thisArg); + return thisArg === undefined + ? property(func) + : baseMatchesProperty(func, thisArg); } export default baseCallback; diff --git a/internal/baseClone.js b/internal/baseClone.js index ded78350a..7d3765169 100644 --- a/internal/baseClone.js +++ b/internal/baseClone.js @@ -1,13 +1,12 @@ import arrayCopy from './arrayCopy'; import arrayEach from './arrayEach'; -import baseCopy from './baseCopy'; +import baseAssign from './baseAssign'; import baseForOwn from './baseForOwn'; import initCloneArray from './initCloneArray'; import initCloneByTag from './initCloneByTag'; import initCloneObject from './initCloneObject'; import isArray from '../lang/isArray'; import isObject from '../lang/isObject'; -import keys from '../object/keys'; /** `Object#toString` result references. */ var argsTag = '[object Arguments]', @@ -78,7 +77,7 @@ function baseClone(value, isDeep, customizer, key, object, stackA, stackB) { if (customizer) { result = object ? customizer(value, key, object) : customizer(value); } - if (typeof result != 'undefined') { + if (result !== undefined) { return result; } if (!isObject(value)) { @@ -97,7 +96,7 @@ function baseClone(value, isDeep, customizer, key, object, stackA, stackB) { if (tag == objectTag || tag == argsTag || (isFunc && !object)) { result = initCloneObject(isFunc ? {} : value); if (!isDeep) { - return baseCopy(value, result, keys(value)); + return baseAssign(result, value); } } else { return cloneableTags[tag] diff --git a/internal/baseCompareAscending.js b/internal/baseCompareAscending.js index b2f85d38b..7f945d129 100644 --- a/internal/baseCompareAscending.js +++ b/internal/baseCompareAscending.js @@ -12,10 +12,10 @@ function baseCompareAscending(value, other) { var valIsReflexive = value === value, othIsReflexive = other === other; - if (value > other || !valIsReflexive || (typeof value == 'undefined' && othIsReflexive)) { + if (value > other || !valIsReflexive || (value === undefined && othIsReflexive)) { return 1; } - if (value < other || !othIsReflexive || (typeof other == 'undefined' && valIsReflexive)) { + if (value < other || !othIsReflexive || (other === undefined && valIsReflexive)) { return -1; } } diff --git a/internal/baseCopy.js b/internal/baseCopy.js index 8c0dbb54c..be5759522 100644 --- a/internal/baseCopy.js +++ b/internal/baseCopy.js @@ -1,17 +1,15 @@ /** - * Copies the properties of `source` to `object`. + * Copies properties of `source` to `object`. * * @private * @param {Object} source The object to copy properties from. - * @param {Object} [object={}] The object to copy properties to. * @param {Array} props The property names to copy. + * @param {Object} [object={}] The object to copy properties to. * @returns {Object} Returns `object`. */ -function baseCopy(source, object, props) { - if (!props) { - props = object; - object = {}; - } +function baseCopy(source, props, object) { + object || (object = {}); + var index = -1, length = props.length; diff --git a/internal/baseFill.js b/internal/baseFill.js index 3b95d273b..bbb3e8506 100644 --- a/internal/baseFill.js +++ b/internal/baseFill.js @@ -15,7 +15,7 @@ function baseFill(array, value, start, end) { if (start < 0) { start = -start > length ? 0 : (length + start); } - end = (typeof end == 'undefined' || end > length) ? length : (+end || 0); + end = (end === undefined || end > length) ? length : (+end || 0); if (end < 0) { end += length; } diff --git a/internal/baseFor.js b/internal/baseFor.js index c336da0fd..5c642b7a8 100644 --- a/internal/baseFor.js +++ b/internal/baseFor.js @@ -3,7 +3,7 @@ import createBaseFor from './createBaseFor'; /** * The base implementation of `baseForIn` and `baseForOwn` which iterates * over `object` properties returned by `keysFunc` invoking `iteratee` for - * each property. Iterator functions may exit iteration early by explicitly + * each property. Iteratee functions may exit iteration early by explicitly * returning `false`. * * @private diff --git a/internal/baseGet.js b/internal/baseGet.js new file mode 100644 index 000000000..17b8a2448 --- /dev/null +++ b/internal/baseGet.js @@ -0,0 +1,29 @@ +import toObject from './toObject'; + +/** + * The base implementation of `get` without support for string paths + * and default values. + * + * @private + * @param {Object} object The object to query. + * @param {Array} path The path of the property to get. + * @param {string} [pathKey] The key representation of path. + * @returns {*} Returns the resolved value. + */ +function baseGet(object, path, pathKey) { + if (object == null) { + return; + } + if (pathKey !== undefined && pathKey in toObject(object)) { + path = [pathKey]; + } + var index = -1, + length = path.length; + + while (object != null && ++index < length) { + var result = object = object[path[index]]; + } + return result; +} + +export default baseGet; diff --git a/internal/baseIsEqualDeep.js b/internal/baseIsEqualDeep.js index daf31f91a..3a9c06e46 100644 --- a/internal/baseIsEqualDeep.js +++ b/internal/baseIsEqualDeep.js @@ -7,7 +7,6 @@ import isTypedArray from '../lang/isTypedArray'; /** `Object#toString` result references. */ var argsTag = '[object Arguments]', arrayTag = '[object Array]', - funcTag = '[object Function]', objectTag = '[object Object]'; /** Used for native method references. */ @@ -59,27 +58,23 @@ function baseIsEqualDeep(object, other, equalFunc, customizer, isLoose, stackA, othIsArr = isTypedArray(other); } } - var objIsObj = (objTag == objectTag || (isLoose && objTag == funcTag)), - othIsObj = (othTag == objectTag || (isLoose && othTag == funcTag)), + var objIsObj = objTag == objectTag, + othIsObj = othTag == objectTag, isSameTag = objTag == othTag; if (isSameTag && !(objIsArr || objIsObj)) { return equalByTag(object, other, objTag); } - if (isLoose) { - if (!isSameTag && !(objIsObj && othIsObj)) { - return false; - } - } else { + if (!isLoose) { var valWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'), othWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__'); if (valWrapped || othWrapped) { return equalFunc(valWrapped ? object.value() : object, othWrapped ? other.value() : other, customizer, isLoose, stackA, stackB); } - if (!isSameTag) { - return false; - } + } + if (!isSameTag) { + return false; } // Assume cyclic values are equal. // For more information on detecting circular references see https://es5.github.io/#JO. diff --git a/internal/baseIsMatch.js b/internal/baseIsMatch.js index 4815a15e4..60d461575 100644 --- a/internal/baseIsMatch.js +++ b/internal/baseIsMatch.js @@ -32,10 +32,10 @@ function baseIsMatch(object, props, values, strictCompareFlags, customizer) { srcValue = values[index]; if (noCustomizer && strictCompareFlags[index]) { - var result = typeof objValue != 'undefined' || (key in object); + var result = objValue !== undefined || (key in object); } else { result = customizer ? customizer(objValue, srcValue, key) : undefined; - if (typeof result == 'undefined') { + if (result === undefined) { result = baseIsEqual(srcValue, objValue, customizer, true); } } diff --git a/internal/baseMap.js b/internal/baseMap.js index 53df2f4d4..f679ae13f 100644 --- a/internal/baseMap.js +++ b/internal/baseMap.js @@ -1,4 +1,6 @@ import baseEach from './baseEach'; +import getLength from './getLength'; +import isLength from './isLength'; /** * The base implementation of `_.map` without support for callback shorthands @@ -10,9 +12,12 @@ import baseEach from './baseEach'; * @returns {Array} Returns the new mapped array. */ function baseMap(collection, iteratee) { - var result = []; + var index = -1, + length = getLength(collection), + result = isLength(length) ? Array(length) : []; + baseEach(collection, function(value, key, collection) { - result.push(iteratee(value, key, collection)); + result[++index] = iteratee(value, key, collection); }); return result; } diff --git a/internal/baseMatches.js b/internal/baseMatches.js index cefb123b4..87f40a81d 100644 --- a/internal/baseMatches.js +++ b/internal/baseMatches.js @@ -24,8 +24,10 @@ function baseMatches(source) { if (isStrictComparable(value)) { return function(object) { - return object != null && object[key] === value && - (typeof value != 'undefined' || (key in toObject(object))); + if (object == null) { + return false; + } + return object[key] === value && (value !== undefined || (key in toObject(object))); }; } } diff --git a/internal/baseMatchesProperty.js b/internal/baseMatchesProperty.js index 242b690c2..4cd67cfd3 100644 --- a/internal/baseMatchesProperty.js +++ b/internal/baseMatchesProperty.js @@ -1,25 +1,45 @@ +import baseGet from './baseGet'; import baseIsEqual from './baseIsEqual'; +import baseSlice from './baseSlice'; +import isArray from '../lang/isArray'; +import isKey from './isKey'; import isStrictComparable from './isStrictComparable'; +import last from '../array/last'; import toObject from './toObject'; +import toPath from './toPath'; /** - * The base implementation of `_.matchesProperty` which does not coerce `key` - * to a string. + * The base implementation of `_.matchesProperty` which does not which does + * not clone `value`. * * @private - * @param {string} key The key of the property to get. + * @param {string} path The path of the property to get. * @param {*} value The value to compare. * @returns {Function} Returns the new function. */ -function baseMatchesProperty(key, value) { - if (isStrictComparable(value)) { - return function(object) { - return object != null && object[key] === value && - (typeof value != 'undefined' || (key in toObject(object))); - }; - } +function baseMatchesProperty(path, value) { + var isArr = isArray(path), + isCommon = isKey(path) && isStrictComparable(value), + pathKey = (path + ''); + + path = toPath(path); return function(object) { - return object != null && baseIsEqual(value, object[key], null, true); + if (object == null) { + return false; + } + var key = pathKey; + object = toObject(object); + if ((isArr || !isCommon) && !(key in object)) { + object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1)); + if (object == null) { + return false; + } + key = last(path); + object = toObject(object); + } + return object[key] === value + ? (value !== undefined || (key in object)) + : baseIsEqual(value, object[key], null, true); }; } diff --git a/internal/baseMerge.js b/internal/baseMerge.js index e36ed0ea0..c10735a97 100644 --- a/internal/baseMerge.js +++ b/internal/baseMerge.js @@ -1,11 +1,18 @@ import arrayEach from './arrayEach'; -import baseForOwn from './baseForOwn'; import baseMergeDeep from './baseMergeDeep'; +import getSymbols from './getSymbols'; import isArray from '../lang/isArray'; import isLength from './isLength'; import isObject from '../lang/isObject'; import isObjectLike from './isObjectLike'; import isTypedArray from '../lang/isTypedArray'; +import keys from '../object/keys'; + +/** Used for native method references. */ +var arrayProto = Array.prototype; + +/** Native method references. */ +var push = arrayProto.push; /** * The base implementation of `_.merge` without support for argument juggling, @@ -17,29 +24,39 @@ import isTypedArray from '../lang/isTypedArray'; * @param {Function} [customizer] The function to customize merging properties. * @param {Array} [stackA=[]] Tracks traversed source objects. * @param {Array} [stackB=[]] Associates values with source counterparts. - * @returns {Object} Returns the destination object. + * @returns {Object} Returns `object`. */ function baseMerge(object, source, customizer, stackA, stackB) { if (!isObject(object)) { return object; } var isSrcArr = isLength(source.length) && (isArray(source) || isTypedArray(source)); - (isSrcArr ? arrayEach : baseForOwn)(source, function(srcValue, key, source) { + if (!isSrcArr) { + var props = keys(source); + push.apply(props, getSymbols(source)); + } + arrayEach(props || source, function(srcValue, key) { + if (props) { + key = srcValue; + srcValue = source[key]; + } if (isObjectLike(srcValue)) { stackA || (stackA = []); stackB || (stackB = []); - return baseMergeDeep(object, source, key, baseMerge, customizer, stackA, stackB); + baseMergeDeep(object, source, key, baseMerge, customizer, stackA, stackB); } - var value = object[key], - result = customizer ? customizer(value, srcValue, key, object, source) : undefined, - isCommon = typeof result == 'undefined'; + else { + var value = object[key], + result = customizer ? customizer(value, srcValue, key, object, source) : undefined, + isCommon = result === undefined; - if (isCommon) { - result = srcValue; - } - if ((isSrcArr || typeof result != 'undefined') && - (isCommon || (result === result ? (result !== value) : (value === value)))) { - object[key] = result; + if (isCommon) { + result = srcValue; + } + if ((isSrcArr || result !== undefined) && + (isCommon || (result === result ? (result !== value) : (value === value)))) { + object[key] = result; + } } }); return object; diff --git a/internal/baseMergeDeep.js b/internal/baseMergeDeep.js index d3e67e7b9..7147f12e8 100644 --- a/internal/baseMergeDeep.js +++ b/internal/baseMergeDeep.js @@ -1,4 +1,5 @@ import arrayCopy from './arrayCopy'; +import getLength from './getLength'; import isArguments from '../lang/isArguments'; import isArray from '../lang/isArray'; import isLength from './isLength'; @@ -33,14 +34,14 @@ function baseMergeDeep(object, source, key, mergeFunc, customizer, stackA, stack } var value = object[key], result = customizer ? customizer(value, srcValue, key, object, source) : undefined, - isCommon = typeof result == 'undefined'; + isCommon = result === undefined; if (isCommon) { result = srcValue; if (isLength(srcValue.length) && (isArray(srcValue) || isTypedArray(srcValue))) { result = isArray(value) ? value - : ((value && value.length) ? arrayCopy(value) : []); + : (getLength(value) ? arrayCopy(value) : []); } else if (isPlainObject(srcValue) || isArguments(srcValue)) { result = isArguments(value) diff --git a/internal/baseProperty.js b/internal/baseProperty.js index 17322fe3e..96ac4c835 100644 --- a/internal/baseProperty.js +++ b/internal/baseProperty.js @@ -1,5 +1,5 @@ /** - * The base implementation of `_.property` which does not coerce `key` to a string. + * The base implementation of `_.property` without support for deep paths. * * @private * @param {string} key The key of the property to get. diff --git a/internal/basePropertyDeep.js b/internal/basePropertyDeep.js new file mode 100644 index 000000000..4644bd6c0 --- /dev/null +++ b/internal/basePropertyDeep.js @@ -0,0 +1,19 @@ +import baseGet from './baseGet'; +import toPath from './toPath'; + +/** + * A specialized version of `baseProperty` which supports deep paths. + * + * @private + * @param {Array|string} path The path of the property to get. + * @returns {Function} Returns the new function. + */ +function basePropertyDeep(path) { + var pathKey = (path + ''); + path = toPath(path); + return function(object) { + return baseGet(object, path, pathKey); + }; +} + +export default basePropertyDeep; diff --git a/internal/basePullAt.js b/internal/basePullAt.js new file mode 100644 index 000000000..fe00c5b64 --- /dev/null +++ b/internal/basePullAt.js @@ -0,0 +1,30 @@ +import isIndex from './isIndex'; + +/** Used for native method references. */ +var arrayProto = Array.prototype; + +/** Native method references. */ +var splice = arrayProto.splice; + +/** + * The base implementation of `_.pullAt` without support for individual + * index arguments and capturing the removed elements. + * + * @private + * @param {Array} array The array to modify. + * @param {number[]} indexes The indexes of elements to remove. + * @returns {Array} Returns `array`. + */ +function basePullAt(array, indexes) { + var length = indexes.length; + while (length--) { + var index = parseFloat(indexes[length]); + if (index != previous && isIndex(index)) { + var previous = index; + splice.call(array, index, 1); + } + } + return array; +} + +export default basePullAt; diff --git a/internal/baseSlice.js b/internal/baseSlice.js index c9fe3a36f..d26a4d439 100644 --- a/internal/baseSlice.js +++ b/internal/baseSlice.js @@ -15,7 +15,7 @@ function baseSlice(array, start, end) { if (start < 0) { start = -start > length ? 0 : (length + start); } - end = (typeof end == 'undefined' || end > length) ? length : (+end || 0); + end = (end === undefined || end > length) ? length : (+end || 0); if (end < 0) { end += length; } diff --git a/internal/baseSortByOrder.js b/internal/baseSortByOrder.js index 41703ee96..192a459d7 100644 --- a/internal/baseSortByOrder.js +++ b/internal/baseSortByOrder.js @@ -1,30 +1,26 @@ -import baseEach from './baseEach'; +import arrayMap from './arrayMap'; +import baseCallback from './baseCallback'; +import baseMap from './baseMap'; import baseSortBy from './baseSortBy'; import compareMultiple from './compareMultiple'; -import isLength from './isLength'; /** * The base implementation of `_.sortByOrder` without param guards. * * @private * @param {Array|Object|string} collection The collection to iterate over. - * @param {string[]} props The property names to sort by. - * @param {boolean[]} orders The sort orders of `props`. + * @param {Function[]|Object[]|string[]} iteratees The iteratees to sort by. + * @param {boolean[]} orders The sort orders of `iteratees`. * @returns {Array} Returns the new sorted array. */ -function baseSortByOrder(collection, props, orders) { - var index = -1, - length = collection.length, - result = isLength(length) ? Array(length) : []; +function baseSortByOrder(collection, iteratees, orders) { + var index = -1; - baseEach(collection, function(value) { - var length = props.length, - criteria = Array(length); + iteratees = arrayMap(iteratees, function(iteratee) { return baseCallback(iteratee); }); - while (length--) { - criteria[length] = value == null ? undefined : value[props[length]]; - } - result[++index] = { 'criteria': criteria, 'index': index, 'value': value }; + var result = baseMap(collection, function(value) { + var criteria = arrayMap(iteratees, function(iteratee) { return iteratee(value); }); + return { 'criteria': criteria, 'index': ++index, 'value': value }; }); return baseSortBy(result, function(object, other) { diff --git a/internal/baseValues.js b/internal/baseValues.js index 5b2434303..935114af7 100644 --- a/internal/baseValues.js +++ b/internal/baseValues.js @@ -1,7 +1,7 @@ /** * The base implementation of `_.values` and `_.valuesIn` which creates an * array of `object` property values corresponding to the property names - * returned by `keysFunc`. + * of `props`. * * @private * @param {Object} object The object to query. diff --git a/internal/binaryIndexBy.js b/internal/binaryIndexBy.js index 022be3cde..191dcd892 100644 --- a/internal/binaryIndexBy.js +++ b/internal/binaryIndexBy.js @@ -27,7 +27,7 @@ function binaryIndexBy(array, value, iteratee, retHighest) { var low = 0, high = array ? array.length : 0, valIsNaN = value !== value, - valIsUndef = typeof value == 'undefined'; + valIsUndef = value === undefined; while (low < high) { var mid = floor((low + high) / 2), @@ -37,7 +37,7 @@ function binaryIndexBy(array, value, iteratee, retHighest) { if (valIsNaN) { var setLow = isReflexive || retHighest; } else if (valIsUndef) { - setLow = isReflexive && (retHighest || typeof computed != 'undefined'); + setLow = isReflexive && (retHighest || computed !== undefined); } else { setLow = retHighest ? (computed <= value) : (computed < value); } diff --git a/internal/bindCallback.js b/internal/bindCallback.js index e6965cfbe..ca3397e8a 100644 --- a/internal/bindCallback.js +++ b/internal/bindCallback.js @@ -14,7 +14,7 @@ function bindCallback(func, thisArg, argCount) { if (typeof func != 'function') { return identity; } - if (typeof thisArg == 'undefined') { + if (thisArg === undefined) { return func; } switch (argCount) { diff --git a/internal/compareMultiple.js b/internal/compareMultiple.js index a148dd15a..da75ed3e0 100644 --- a/internal/compareMultiple.js +++ b/internal/compareMultiple.js @@ -4,7 +4,7 @@ import baseCompareAscending from './baseCompareAscending'; * Used by `_.sortByOrder` to compare multiple properties of each element * in a collection and stable sort them in the following order: * - * If orders is unspecified, sort in ascending order for all properties. + * If `orders` is unspecified, sort in ascending order for all properties. * Otherwise, for each property, sort in ascending order if its corresponding value in * orders is true, and descending order if false. * diff --git a/internal/createAssigner.js b/internal/createAssigner.js index eb48c0b1c..a1179b7f4 100644 --- a/internal/createAssigner.js +++ b/internal/createAssigner.js @@ -1,5 +1,6 @@ import bindCallback from './bindCallback'; import isIterateeCall from './isIterateeCall'; +import restParam from '../function/restParam'; /** * Creates a function that assigns properties of source object(s) to a given @@ -12,38 +13,32 @@ import isIterateeCall from './isIterateeCall'; * @returns {Function} Returns the new assigner function. */ function createAssigner(assigner) { - return function() { - var args = arguments, - length = args.length, - object = args[0]; + return restParam(function(object, sources) { + var index = -1, + length = object == null ? 0 : sources.length, + customizer = length > 2 && sources[length - 2], + guard = length > 2 && sources[2], + thisArg = length > 1 && sources[length - 1]; - if (length < 2 || object == null) { - return object; - } - var customizer = args[length - 2], - thisArg = args[length - 1], - guard = args[3]; - - if (length > 3 && typeof customizer == 'function') { + if (typeof customizer == 'function') { customizer = bindCallback(customizer, thisArg, 5); length -= 2; } else { - customizer = (length > 2 && typeof thisArg == 'function') ? thisArg : null; + customizer = typeof thisArg == 'function' ? thisArg : null; length -= (customizer ? 1 : 0); } - if (guard && isIterateeCall(args[1], args[2], guard)) { - customizer = length == 3 ? null : customizer; - length = 2; + if (guard && isIterateeCall(sources[0], sources[1], guard)) { + customizer = length < 3 ? null : customizer; + length = 1; } - var index = 0; while (++index < length) { - var source = args[index]; + var source = sources[index]; if (source) { assigner(object, source, customizer); } } return object; - }; + }); } export default createAssigner; diff --git a/internal/createBaseEach.js b/internal/createBaseEach.js index 9d332e505..4a28c9351 100644 --- a/internal/createBaseEach.js +++ b/internal/createBaseEach.js @@ -1,3 +1,4 @@ +import getLength from './getLength'; import isLength from './isLength'; import toObject from './toObject'; @@ -11,7 +12,7 @@ import toObject from './toObject'; */ function createBaseEach(eachFunc, fromRight) { return function(collection, iteratee) { - var length = collection ? collection.length : 0; + var length = collection ? getLength(collection) : 0; if (!isLength(length)) { return eachFunc(collection, iteratee); } diff --git a/internal/createForEach.js b/internal/createForEach.js index da49217e8..fd213aefe 100644 --- a/internal/createForEach.js +++ b/internal/createForEach.js @@ -11,7 +11,7 @@ import isArray from '../lang/isArray'; */ function createForEach(arrayFunc, eachFunc) { return function(collection, iteratee, thisArg) { - return (typeof iteratee == 'function' && typeof thisArg == 'undefined' && isArray(collection)) + return (typeof iteratee == 'function' && thisArg === undefined && isArray(collection)) ? arrayFunc(collection, iteratee) : eachFunc(collection, bindCallback(iteratee, thisArg, 3)); }; diff --git a/internal/createForIn.js b/internal/createForIn.js index d6849fffa..22ffa4e93 100644 --- a/internal/createForIn.js +++ b/internal/createForIn.js @@ -10,7 +10,7 @@ import keysIn from '../object/keysIn'; */ function createForIn(objectFunc) { return function(object, iteratee, thisArg) { - if (typeof iteratee != 'function' || typeof thisArg != 'undefined') { + if (typeof iteratee != 'function' || thisArg !== undefined) { iteratee = bindCallback(iteratee, thisArg, 3); } return objectFunc(object, iteratee, keysIn); diff --git a/internal/createForOwn.js b/internal/createForOwn.js index 3b5dc796a..cf912cfdf 100644 --- a/internal/createForOwn.js +++ b/internal/createForOwn.js @@ -9,7 +9,7 @@ import bindCallback from './bindCallback'; */ function createForOwn(objectFunc) { return function(object, iteratee, thisArg) { - if (typeof iteratee != 'function' || typeof thisArg != 'undefined') { + if (typeof iteratee != 'function' || thisArg !== undefined) { iteratee = bindCallback(iteratee, thisArg, 3); } return objectFunc(object, iteratee); diff --git a/internal/createReduce.js b/internal/createReduce.js index 21ed9e086..66c99fde2 100644 --- a/internal/createReduce.js +++ b/internal/createReduce.js @@ -13,7 +13,7 @@ import isArray from '../lang/isArray'; function createReduce(arrayFunc, eachFunc) { return function(collection, iteratee, accumulator, thisArg) { var initFromArray = arguments.length < 3; - return (typeof iteratee == 'function' && typeof thisArg == 'undefined' && isArray(collection)) + return (typeof iteratee == 'function' && thisArg === undefined && isArray(collection)) ? arrayFunc(collection, iteratee, accumulator, initFromArray) : baseReduce(collection, baseCallback(iteratee, thisArg, 4), accumulator, initFromArray, eachFunc); }; diff --git a/internal/equalArrays.js b/internal/equalArrays.js index 5a687a6c8..58d8f6234 100644 --- a/internal/equalArrays.js +++ b/internal/equalArrays.js @@ -32,7 +32,7 @@ function equalArrays(array, other, equalFunc, customizer, isLoose, stackA, stack ? customizer(othValue, arrValue, index) : customizer(arrValue, othValue, index); } - if (typeof result == 'undefined') { + if (result === undefined) { // Recursively compare arrays (susceptible to call stack limits). if (isLoose) { var othIndex = othLength; diff --git a/internal/equalObjects.js b/internal/equalObjects.js index f51bf12fb..0aecfeaa8 100644 --- a/internal/equalObjects.js +++ b/internal/equalObjects.js @@ -46,7 +46,7 @@ function equalObjects(object, other, equalFunc, customizer, isLoose, stackA, sta ? customizer(othValue, objValue, key) : customizer(objValue, othValue, key); } - if (typeof result == 'undefined') { + if (result === undefined) { // Recursively compare objects (susceptible to call stack limits). result = (objValue && objValue === othValue) || equalFunc(objValue, othValue, customizer, isLoose, stackA, stackB); } diff --git a/internal/getLength.js b/internal/getLength.js new file mode 100644 index 000000000..0ecc1e0df --- /dev/null +++ b/internal/getLength.js @@ -0,0 +1,15 @@ +import baseProperty from './baseProperty'; + +/** + * Gets the "length" property value of `object`. + * + * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792) + * in Safari on iOS 8.1 ARM64. + * + * @private + * @param {Object} object The object to query. + * @returns {*} Returns the "length" value. + */ +var getLength = baseProperty('length'); + +export default getLength; diff --git a/internal/getSymbols.js b/internal/getSymbols.js new file mode 100644 index 000000000..e92386712 --- /dev/null +++ b/internal/getSymbols.js @@ -0,0 +1,19 @@ +import constant from '../utility/constant'; +import isNative from '../lang/isNative'; +import toObject from './toObject'; + +/** Native method references. */ +var getOwnPropertySymbols = isNative(getOwnPropertySymbols = Object.getOwnPropertySymbols) && getOwnPropertySymbols; + +/** + * Creates an array of the own symbols of `object`. + * + * @private + * @param {Object} object The object to query. + * @returns {Array} Returns the array of symbols. + */ +var getSymbols = !getOwnPropertySymbols ? constant([]) : function(object) { + return getOwnPropertySymbols(toObject(object)); +}; + +export default getSymbols; diff --git a/internal/initCloneByTag.js b/internal/initCloneByTag.js index 3bd9ea6ae..3751a36e5 100644 --- a/internal/initCloneByTag.js +++ b/internal/initCloneByTag.js @@ -27,7 +27,6 @@ var reFlags = /\w*$/; * **Note:** This function only supports cloning values with tags of * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`. * - * * @private * @param {Object} object The object to clone. * @param {string} tag The `toStringTag` of the object to clone. diff --git a/internal/invokePath.js b/internal/invokePath.js new file mode 100644 index 000000000..1aee55a25 --- /dev/null +++ b/internal/invokePath.js @@ -0,0 +1,26 @@ +import baseGet from './baseGet'; +import baseSlice from './baseSlice'; +import isKey from './isKey'; +import last from '../array/last'; +import toPath from './toPath'; + +/** + * Invokes the method at `path` on `object`. + * + * @private + * @param {Object} object The object to query. + * @param {Array|string} path The path of the method to invoke. + * @param {Array} args The arguments to invoke the method with. + * @returns {*} Returns the result of the invoked method. + */ +function invokePath(object, path, args) { + if (object != null && !isKey(path, object)) { + path = toPath(path); + object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1)); + path = last(path); + } + var func = object == null ? object : object[path]; + return func == null ? undefined : func.apply(object, args); +} + +export default invokePath; diff --git a/internal/isIterateeCall.js b/internal/isIterateeCall.js index e1fc4dd1d..1c82f734a 100644 --- a/internal/isIterateeCall.js +++ b/internal/isIterateeCall.js @@ -1,3 +1,4 @@ +import getLength from './getLength'; import isIndex from './isIndex'; import isLength from './isLength'; import isObject from '../lang/isObject'; @@ -17,7 +18,7 @@ function isIterateeCall(value, index, object) { } var type = typeof index; if (type == 'number') { - var length = object.length, + var length = getLength(object), prereq = isLength(length) && isIndex(index, length); } else { prereq = type == 'string' && index in object; diff --git a/internal/isKey.js b/internal/isKey.js new file mode 100644 index 000000000..f3b2f38d1 --- /dev/null +++ b/internal/isKey.js @@ -0,0 +1,28 @@ +import isArray from '../lang/isArray'; +import toObject from './toObject'; + +/** Used to match property names within property paths. */ +var reIsDeepProp = /\.|\[(?:[^[\]]+|(["'])(?:(?!\1)[^\n\\]|\\.)*?)\1\]/, + reIsPlainProp = /^\w*$/; + +/** + * Checks if `value` is a property name and not a property path. + * + * @private + * @param {*} value The value to check. + * @param {Object} [object] The object to query keys on. + * @returns {boolean} Returns `true` if `value` is a property name, else `false`. + */ +function isKey(value, object) { + var type = typeof value; + if ((type == 'string' && reIsPlainProp.test(value)) || type == 'number') { + return true; + } + if (isArray(value)) { + return false; + } + var result = !reIsDeepProp.test(value); + return result || (object != null && value in toObject(object)); +} + +export default isKey; diff --git a/internal/mapSet.js b/internal/mapSet.js index e80ef6d85..90bd28aee 100644 --- a/internal/mapSet.js +++ b/internal/mapSet.js @@ -1,5 +1,5 @@ /** - * Adds `value` to `key` of the cache. + * Sets `value` to `key` of the cache. * * @private * @name set diff --git a/internal/pickByArray.js b/internal/pickByArray.js index 3abd48a1c..6fde01d36 100644 --- a/internal/pickByArray.js +++ b/internal/pickByArray.js @@ -2,7 +2,7 @@ import toObject from './toObject'; /** * A specialized version of `_.pick` that picks `object` properties specified - * by the `props` array. + * by `props`. * * @private * @param {Object} object The source object. diff --git a/internal/root.js b/internal/root.js index f217bc963..51ef8c247 100644 --- a/internal/root.js +++ b/internal/root.js @@ -11,7 +11,7 @@ var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && var freeModule = objectTypes[typeof module] && module && !module.nodeType && module; /** Detect free variable `global` from Node.js. */ -var freeGlobal = freeExports && freeModule && typeof global == 'object' && global; +var freeGlobal = freeExports && freeModule && typeof global == 'object' && global && global.Object && global; /** Detect free variable `self`. */ var freeSelf = objectTypes[typeof self] && self && self.Object && self; diff --git a/internal/shimIsPlainObject.js b/internal/shimIsPlainObject.js index ab02f3632..98d61330f 100644 --- a/internal/shimIsPlainObject.js +++ b/internal/shimIsPlainObject.js @@ -44,7 +44,7 @@ function shimIsPlainObject(value) { baseForIn(value, function(subValue, key) { result = key; }); - return typeof result == 'undefined' || hasOwnProperty.call(value, result); + return result === undefined || hasOwnProperty.call(value, result); } export default shimIsPlainObject; diff --git a/internal/shimKeys.js b/internal/shimKeys.js index b55beb189..d4c91d338 100644 --- a/internal/shimKeys.js +++ b/internal/shimKeys.js @@ -16,7 +16,7 @@ var hasOwnProperty = objectProto.hasOwnProperty; * own enumerable property names of `object`. * * @private - * @param {Object} object The object to inspect. + * @param {Object} object The object to query. * @returns {Array} Returns the array of property names. */ function shimKeys(object) { diff --git a/internal/toIterable.js b/internal/toIterable.js index e1cf81175..b0cc6e7a6 100644 --- a/internal/toIterable.js +++ b/internal/toIterable.js @@ -1,3 +1,4 @@ +import getLength from './getLength'; import isLength from './isLength'; import isObject from '../lang/isObject'; import values from '../object/values'; @@ -13,7 +14,7 @@ function toIterable(value) { if (value == null) { return []; } - if (!isLength(value.length)) { + if (!isLength(getLength(value))) { return values(value); } return isObject(value) ? value : Object(value); diff --git a/internal/toPath.js b/internal/toPath.js new file mode 100644 index 000000000..8c1da9306 --- /dev/null +++ b/internal/toPath.js @@ -0,0 +1,28 @@ +import baseToString from './baseToString'; +import isArray from '../lang/isArray'; + +/** Used to match property names within property paths. */ +var rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g; + +/** Used to match backslashes in property paths. */ +var reEscapeChar = /\\(\\)?/g; + +/** + * Converts `value` to property path array if it is not one. + * + * @private + * @param {*} value The value to process. + * @returns {Array} Returns the property path array. + */ +function toPath(value) { + if (isArray(value)) { + return value; + } + var result = []; + baseToString(value).replace(rePropName, function(match, number, quote, string) { + result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match)); + }); + return result; +} + +export default toPath; diff --git a/lang/isEmpty.js b/lang/isEmpty.js index 11e5fb898..5329041f1 100644 --- a/lang/isEmpty.js +++ b/lang/isEmpty.js @@ -1,3 +1,4 @@ +import getLength from '../internal/getLength'; import isArguments from './isArguments'; import isArray from './isArray'; import isFunction from './isFunction'; @@ -37,7 +38,7 @@ function isEmpty(value) { if (value == null) { return true; } - var length = value.length; + var length = getLength(value); if (isLength(length) && (isArray(value) || isString(value) || isArguments(value) || (isObjectLike(value) && isFunction(value.splice)))) { return !length; diff --git a/lang/isEqual.js b/lang/isEqual.js index 11b487fc1..f38adcb01 100644 --- a/lang/isEqual.js +++ b/lang/isEqual.js @@ -20,7 +20,7 @@ import isStrictComparable from '../internal/isStrictComparable'; * @category Lang * @param {*} value The value to compare. * @param {*} other The other value to compare. - * @param {Function} [customizer] The function to customize comparing values. + * @param {Function} [customizer] The function to customize value comparisons. * @param {*} [thisArg] The `this` binding of `customizer`. * @returns {boolean} Returns `true` if the values are equivalent, else `false`. * @example @@ -51,7 +51,7 @@ function isEqual(value, other, customizer, thisArg) { return value === other; } var result = customizer ? customizer(value, other) : undefined; - return typeof result == 'undefined' ? baseIsEqual(value, other, customizer) : !!result; + return result === undefined ? baseIsEqual(value, other, customizer) : !!result; } export default isEqual; diff --git a/lang/isMatch.js b/lang/isMatch.js index 80c22aecf..37f932399 100644 --- a/lang/isMatch.js +++ b/lang/isMatch.js @@ -21,7 +21,7 @@ import toObject from '../internal/toObject'; * @category Lang * @param {Object} object The object to inspect. * @param {Object} source The object of property values to match. - * @param {Function} [customizer] The function to customize comparing values. + * @param {Function} [customizer] The function to customize value comparisons. * @param {*} [thisArg] The `this` binding of `customizer`. * @returns {boolean} Returns `true` if `object` is a match, else `false`. * @example @@ -54,12 +54,13 @@ function isMatch(object, source, customizer, thisArg) { return false; } customizer = typeof customizer == 'function' && bindCallback(customizer, thisArg, 3); + object = toObject(object); if (!customizer && length == 1) { var key = props[0], value = source[key]; if (isStrictComparable(value)) { - return value === object[key] && (typeof value != 'undefined' || (key in toObject(object))); + return value === object[key] && (value !== undefined || (key in object)); } } var values = Array(length), @@ -69,7 +70,7 @@ function isMatch(object, source, customizer, thisArg) { value = values[length] = source[props[length]]; strictCompareFlags[length] = isStrictComparable(value); } - return baseIsMatch(toObject(object), props, values, strictCompareFlags, customizer); + return baseIsMatch(object, props, values, strictCompareFlags, customizer); } export default isMatch; diff --git a/lang/isNative.js b/lang/isNative.js index 6c69a8a3c..11d343a14 100644 --- a/lang/isNative.js +++ b/lang/isNative.js @@ -5,7 +5,7 @@ import isObjectLike from '../internal/isObjectLike'; var funcTag = '[object Function]'; /** Used to detect host constructors (Safari > 5). */ -var reHostCtor = /^\[object .+?Constructor\]$/; +var reIsHostCtor = /^\[object .+?Constructor\]$/; /** Used for native method references. */ var objectProto = Object.prototype; @@ -20,7 +20,7 @@ var fnToString = Function.prototype.toString; var objToString = objectProto.toString; /** Used to detect if a method is native. */ -var reNative = RegExp('^' + +var reIsNative = RegExp('^' + escapeRegExp(objToString) .replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$' ); @@ -46,9 +46,9 @@ function isNative(value) { return false; } if (objToString.call(value) == funcTag) { - return reNative.test(fnToString.call(value)); + return reIsNative.test(fnToString.call(value)); } - return isObjectLike(value) && reHostCtor.test(value); + return isObjectLike(value) && reIsHostCtor.test(value); } export default isNative; diff --git a/lang/isUndefined.js b/lang/isUndefined.js index ccff50bcb..fe89ac689 100644 --- a/lang/isUndefined.js +++ b/lang/isUndefined.js @@ -15,7 +15,7 @@ * // => false */ function isUndefined(value) { - return typeof value == 'undefined'; + return value === undefined; } export default isUndefined; diff --git a/lang/toArray.js b/lang/toArray.js index ee7bc15a1..bab36a8ad 100644 --- a/lang/toArray.js +++ b/lang/toArray.js @@ -1,4 +1,5 @@ import arrayCopy from '../internal/arrayCopy'; +import getLength from '../internal/getLength'; import isLength from '../internal/isLength'; import values from '../object/values'; @@ -18,7 +19,7 @@ import values from '../object/values'; * // => [2, 3] */ function toArray(value) { - var length = value ? value.length : 0; + var length = value ? getLength(value) : 0; if (!isLength(length)) { return values(value); } diff --git a/lodash.js b/lodash.js index da01ec008..fe5f6fc49 100644 --- a/lodash.js +++ b/lodash.js @@ -1,9 +1,9 @@ /** * @license - * lodash 3.6.0 (Custom Build) + * lodash 3.7.0 (Custom Build) * Build: `lodash modularize modern exports="es" -o ./` * Copyright 2012-2015 The Dojo Foundation - * Based on Underscore.js 1.8.2 + * Based on Underscore.js 1.8.3 * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors * Available under MIT license */ @@ -25,7 +25,6 @@ import baseCallback from './internal/baseCallback'; import baseForOwn from './internal/baseForOwn'; import baseFunctions from './internal/baseFunctions'; import baseMatches from './internal/baseMatches'; -import baseProperty from './internal/baseProperty'; import createHybridWrapper from './internal/createHybridWrapper'; import identity from './utility/identity'; import isArray from './lang/isArray'; @@ -37,12 +36,13 @@ import lazyReverse from './internal/lazyReverse'; import lazyValue from './internal/lazyValue'; import lodash from './chain/lodash'; import _mixin from './utility/mixin'; +import property from './utility/property'; import realNames from './internal/realNames'; import support from './support'; import thru from './chain/thru'; /** Used as the semantic version number. */ -var VERSION = '3.6.0'; +var VERSION = '3.7.0'; /** Used to compose bitmasks for wrapper metadata. */ var BIND_KEY_FLAG = 2; @@ -135,6 +135,8 @@ lodash.matches = utility.matches; lodash.matchesProperty = utility.matchesProperty; lodash.memoize = func.memoize; lodash.merge = object.merge; +lodash.method = utility.method; +lodash.methodOf = utility.methodOf; lodash.mixin = mixin; lodash.negate = func.negate; lodash.omit = object.omit; @@ -145,7 +147,7 @@ lodash.partialRight = func.partialRight; lodash.partition = collection.partition; lodash.pick = object.pick; lodash.pluck = collection.pluck; -lodash.property = utility.property; +lodash.property = property; lodash.propertyOf = utility.propertyOf; lodash.pull = array.pull; lodash.pullAt = array.pullAt; @@ -155,6 +157,7 @@ lodash.reject = collection.reject; lodash.remove = array.remove; lodash.rest = array.rest; lodash.restParam = func.restParam; +lodash.set = object.set; lodash.shuffle = collection.shuffle; lodash.slice = array.slice; lodash.sortBy = collection.sortBy; @@ -221,6 +224,7 @@ lodash.findLastIndex = array.findLastIndex; lodash.findLastKey = object.findLastKey; lodash.findWhere = collection.findWhere; lodash.first = array.first; +lodash.get = object.get; lodash.has = object.has; lodash.identity = identity; lodash.includes = collection.includes; @@ -406,7 +410,7 @@ arrayEach(['initial', 'rest'], function(methodName, index) { // Add `LazyWrapper` methods for `_.pluck` and `_.where`. arrayEach(['pluck', 'where'], function(methodName, index) { var operationName = index ? 'filter' : 'map', - createCallback = index ? baseMatches : baseProperty; + createCallback = index ? baseMatches : property; LazyWrapper.prototype[methodName] = function(value) { return this[operationName](createCallback(value)); @@ -428,7 +432,7 @@ LazyWrapper.prototype.slice = function(start, end) { start = start == null ? 0 : (+start || 0); var result = start < 0 ? this.takeRight(-start) : this.drop(start); - if (typeof end != 'undefined') { + if (end !== undefined) { end = (+end || 0); result = end < 0 ? result.dropRight(-end) : result.take(end - start); } @@ -459,7 +463,7 @@ baseForOwn(LazyWrapper.prototype, function(func, methodName) { useLazy = isLazy || isArray(value); if (useLazy && checkIteratee && typeof iteratee == 'function' && iteratee.length != 1) { - // avoid lazy use if the iteratee has a `length` other than `1` + // avoid lazy use if the iteratee has a "length" value other than `1` isLazy = useLazy = false; } var onlyLazy = isLazy && !isHybrid; diff --git a/math/add.js b/math/add.js index 39b53553c..c8c851d1c 100644 --- a/math/add.js +++ b/math/add.js @@ -13,7 +13,7 @@ * // => 10 */ function add(augend, addend) { - return augend + addend; + return (+augend || 0) + (+addend || 0); } export default add; diff --git a/number/inRange.js b/number/inRange.js index a4f328f0d..35d688c55 100644 --- a/number/inRange.js +++ b/number/inRange.js @@ -1,3 +1,7 @@ +/* Native method references for those with the same name as other `lodash` methods. */ +var nativeMax = Math.max, + nativeMin = Math.min; + /** * Checks if `n` is between `start` and up to but not including, `end`. If * `end` is not specified it is set to `start` with `start` then set to `0`. @@ -37,7 +41,7 @@ function inRange(value, start, end) { } else { end = +end || 0; } - return value >= start && value < end; + return value >= nativeMin(start, end) && value < nativeMax(start, end); } export default inRange; diff --git a/object.js b/object.js index b75fe96a8..4da422d97 100644 --- a/object.js +++ b/object.js @@ -9,6 +9,7 @@ import forInRight from './object/forInRight'; import forOwn from './object/forOwn'; import forOwnRight from './object/forOwnRight'; import functions from './object/functions'; +import get from './object/get'; import has from './object/has'; import invert from './object/invert'; import keys from './object/keys'; @@ -20,6 +21,7 @@ import omit from './object/omit'; import pairs from './object/pairs'; import pick from './object/pick'; import result from './object/result'; +import set from './object/set'; import transform from './object/transform'; import values from './object/values'; import valuesIn from './object/valuesIn'; @@ -36,6 +38,7 @@ export default { 'forOwn': forOwn, 'forOwnRight': forOwnRight, 'functions': functions, + 'get': get, 'has': has, 'invert': invert, 'keys': keys, @@ -47,6 +50,7 @@ export default { 'pairs': pairs, 'pick': pick, 'result': result, + 'set': set, 'transform': transform, 'values': values, 'valuesIn': valuesIn diff --git a/object/assign.js b/object/assign.js index 94d9a26bc..fd6a6b0ae 100644 --- a/object/assign.js +++ b/object/assign.js @@ -1,3 +1,4 @@ +import assignWith from '../internal/assignWith'; import baseAssign from '../internal/baseAssign'; import createAssigner from '../internal/createAssigner'; @@ -8,13 +9,17 @@ import createAssigner from '../internal/createAssigner'; * The `customizer` is bound to `thisArg` and invoked with five arguments: * (objectValue, sourceValue, key, object, source). * + * **Note:** This method mutates `object` and is based on + * [`Object.assign`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-object.assign). + * + * * @static * @memberOf _ * @alias extend * @category Object * @param {Object} object The destination object. * @param {...Object} [sources] The source objects. - * @param {Function} [customizer] The function to customize assigning values. + * @param {Function} [customizer] The function to customize assigned values. * @param {*} [thisArg] The `this` binding of `customizer`. * @returns {Object} Returns `object`. * @example @@ -24,12 +29,16 @@ import createAssigner from '../internal/createAssigner'; * * // using a customizer callback * var defaults = _.partialRight(_.assign, function(value, other) { - * return typeof value == 'undefined' ? other : value; + * return _.isUndefined(value) ? other : value; * }); * * defaults({ 'user': 'barney' }, { 'age': 36 }, { 'user': 'fred' }); * // => { 'user': 'barney', 'age': 36 } */ -var assign = createAssigner(baseAssign); +var assign = createAssigner(function(object, source, customizer) { + return customizer + ? assignWith(object, source, customizer) + : baseAssign(object, source); +}); export default assign; diff --git a/object/create.js b/object/create.js index d735e9e36..1d4dcd49d 100644 --- a/object/create.js +++ b/object/create.js @@ -1,7 +1,6 @@ -import baseCopy from '../internal/baseCopy'; +import baseAssign from '../internal/baseAssign'; import baseCreate from '../internal/baseCreate'; import isIterateeCall from '../internal/isIterateeCall'; -import keys from './keys'; /** * Creates an object that inherits from the given `prototype` object. If a @@ -42,7 +41,7 @@ function create(prototype, properties, guard) { if (guard && isIterateeCall(prototype, properties, guard)) { properties = null; } - return properties ? baseCopy(properties, result, keys(properties)) : result; + return properties ? baseAssign(result, properties) : result; } export default create; diff --git a/object/defaults.js b/object/defaults.js index c8c7fcb14..eb1ff58d6 100644 --- a/object/defaults.js +++ b/object/defaults.js @@ -7,6 +7,8 @@ import restParam from '../function/restParam'; * object for all destination properties that resolve to `undefined`. Once a * property is set, additional values of the same property are ignored. * + * **Note:** This method mutates `object`. + * * @static * @memberOf _ * @category Object diff --git a/object/forIn.js b/object/forIn.js index 4f38bc242..4ac5fdfe3 100644 --- a/object/forIn.js +++ b/object/forIn.js @@ -4,7 +4,7 @@ import createForIn from '../internal/createForIn'; /** * Iterates over own and inherited enumerable properties of an object invoking * `iteratee` for each property. The `iteratee` is bound to `thisArg` and invoked - * with three arguments: (value, key, object). Iterator functions may exit + * with three arguments: (value, key, object). Iteratee functions may exit * iteration early by explicitly returning `false`. * * @static diff --git a/object/forOwn.js b/object/forOwn.js index eec2a9227..096b25ee9 100644 --- a/object/forOwn.js +++ b/object/forOwn.js @@ -4,7 +4,7 @@ import createForOwn from '../internal/createForOwn'; /** * Iterates over own enumerable properties of an object invoking `iteratee` * for each property. The `iteratee` is bound to `thisArg` and invoked with - * three arguments: (value, key, object). Iterator functions may exit iteration + * three arguments: (value, key, object). Iteratee functions may exit iteration * early by explicitly returning `false`. * * @static diff --git a/object/get.js b/object/get.js new file mode 100644 index 000000000..4fe6bcffa --- /dev/null +++ b/object/get.js @@ -0,0 +1,33 @@ +import baseGet from '../internal/baseGet'; +import toPath from '../internal/toPath'; + +/** + * Gets the property value of `path` on `object`. If the resolved value is + * `undefined` the `defaultValue` is used in its place. + * + * @static + * @memberOf _ + * @category Object + * @param {Object} object The object to query. + * @param {Array|string} path The path of the property to get. + * @param {*} [defaultValue] The value returned if the resolved value is `undefined`. + * @returns {*} Returns the resolved value. + * @example + * + * var object = { 'a': [{ 'b': { 'c': 3 } }] }; + * + * _.get(object, 'a[0].b.c'); + * // => 3 + * + * _.get(object, ['a', '0', 'b', 'c']); + * // => 3 + * + * _.get(object, 'a.b.c', 'default'); + * // => 'default' + */ +function get(object, path, defaultValue) { + var result = object == null ? undefined : baseGet(object, toPath(path), path + ''); + return result === undefined ? defaultValue : result; +} + +export default get; diff --git a/object/has.js b/object/has.js index 03357bde9..987e95322 100644 --- a/object/has.js +++ b/object/has.js @@ -1,3 +1,9 @@ +import baseGet from '../internal/baseGet'; +import baseSlice from '../internal/baseSlice'; +import isKey from '../internal/isKey'; +import last from '../array/last'; +import toPath from '../internal/toPath'; + /** Used for native method references. */ var objectProto = Object.prototype; @@ -5,24 +11,39 @@ var objectProto = Object.prototype; var hasOwnProperty = objectProto.hasOwnProperty; /** - * Checks if `key` exists as a direct property of `object` instead of an - * inherited property. + * Checks if `path` is a direct property. * * @static * @memberOf _ * @category Object - * @param {Object} object The object to inspect. - * @param {string} key The key to check. - * @returns {boolean} Returns `true` if `key` is a direct property, else `false`. + * @param {Object} object The object to query. + * @param {Array|string} path The path to check. + * @returns {boolean} Returns `true` if `path` is a direct property, else `false`. * @example * - * var object = { 'a': 1, 'b': 2, 'c': 3 }; + * var object = { 'a': { 'b': { 'c': 3 } } }; * - * _.has(object, 'b'); + * _.has(object, 'a'); + * // => true + * + * _.has(object, 'a.b.c'); + * // => true + * + * _.has(object, ['a', 'b', 'c']); * // => true */ -function has(object, key) { - return object ? hasOwnProperty.call(object, key) : false; +function has(object, path) { + if (object == null) { + return false; + } + var result = hasOwnProperty.call(object, path); + if (!result && !isKey(path)) { + path = toPath(path); + object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1)); + path = last(path); + result = object != null && hasOwnProperty.call(object, path); + } + return result; } export default has; diff --git a/object/keys.js b/object/keys.js index c55c5af65..db7ea27f3 100644 --- a/object/keys.js +++ b/object/keys.js @@ -16,7 +16,7 @@ var nativeKeys = isNative(nativeKeys = Object.keys) && nativeKeys; * @static * @memberOf _ * @category Object - * @param {Object} object The object to inspect. + * @param {Object} object The object to query. * @returns {Array} Returns the array of property names. * @example * @@ -39,7 +39,7 @@ var keys = !nativeKeys ? shimKeys : function(object) { length = object.length; } if ((typeof Ctor == 'function' && Ctor.prototype === object) || - (typeof object != 'function' && (length && isLength(length)))) { + (typeof object != 'function' && isLength(length))) { return shimKeys(object); } return isObject(object) ? nativeKeys(object) : []; diff --git a/object/keysIn.js b/object/keysIn.js index 117338658..a1d763472 100644 --- a/object/keysIn.js +++ b/object/keysIn.js @@ -19,7 +19,7 @@ var hasOwnProperty = objectProto.hasOwnProperty; * @static * @memberOf _ * @category Object - * @param {Object} object The object to inspect. + * @param {Object} object The object to query. * @returns {Array} Returns the array of property names. * @example * diff --git a/object/merge.js b/object/merge.js index 054bfc9b4..e3dc0877f 100644 --- a/object/merge.js +++ b/object/merge.js @@ -15,7 +15,7 @@ import createAssigner from '../internal/createAssigner'; * @category Object * @param {Object} object The destination object. * @param {...Object} [sources] The source objects. - * @param {Function} [customizer] The function to customize merging properties. + * @param {Function} [customizer] The function to customize assigned values. * @param {*} [thisArg] The `this` binding of `customizer`. * @returns {Object} Returns `object`. * @example diff --git a/object/pairs.js b/object/pairs.js index 394d46932..9f4b005d6 100644 --- a/object/pairs.js +++ b/object/pairs.js @@ -7,7 +7,7 @@ import keys from './keys'; * @static * @memberOf _ * @category Object - * @param {Object} object The object to inspect. + * @param {Object} object The object to query. * @returns {Array} Returns the new array of key-value pairs. * @example * diff --git a/object/result.js b/object/result.js index 2198d5f4c..1bf6315cc 100644 --- a/object/result.js +++ b/object/result.js @@ -1,41 +1,49 @@ +import baseGet from '../internal/baseGet'; +import baseSlice from '../internal/baseSlice'; import isFunction from '../lang/isFunction'; +import isKey from '../internal/isKey'; +import last from '../array/last'; +import toPath from '../internal/toPath'; /** - * Resolves the value of property `key` on `object`. If the value of `key` is - * a function it is invoked with the `this` binding of `object` and its result - * is returned, else the property value is returned. If the property value is - * `undefined` the `defaultValue` is used in its place. + * This method is like `_.get` except that if the resolved value is a function + * it is invoked with the `this` binding of its parent object and its result + * is returned. * * @static * @memberOf _ * @category Object * @param {Object} object The object to query. - * @param {string} key The key of the property to resolve. - * @param {*} [defaultValue] The value returned if the property value - * resolves to `undefined`. + * @param {Array|string} path The path of the property to resolve. + * @param {*} [defaultValue] The value returned if the resolved value is `undefined`. * @returns {*} Returns the resolved value. * @example * - * var object = { 'user': 'fred', 'age': _.constant(40) }; + * var object = { 'a': [{ 'b': { 'c1': 3, 'c2': _.constant(4) } }] }; * - * _.result(object, 'user'); - * // => 'fred' + * _.result(object, 'a[0].b.c1'); + * // => 3 * - * _.result(object, 'age'); - * // => 40 + * _.result(object, 'a[0].b.c2'); + * // => 4 * - * _.result(object, 'status', 'busy'); - * // => 'busy' + * _.result(object, 'a.b.c', 'default'); + * // => 'default' * - * _.result(object, 'status', _.constant('busy')); - * // => 'busy' + * _.result(object, 'a.b.c', _.constant('default')); + * // => 'default' */ -function result(object, key, defaultValue) { - var value = object == null ? undefined : object[key]; - if (typeof value == 'undefined') { - value = defaultValue; +function result(object, path, defaultValue) { + var result = object == null ? undefined : object[path]; + if (result === undefined) { + if (object != null && !isKey(path, object)) { + path = toPath(path); + object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1)); + result = object == null ? undefined : object[last(path)]; + } + result = result === undefined ? defaultValue : result; } - return isFunction(value) ? value.call(object) : value; + return isFunction(result) ? result.call(object) : result; } export default result; diff --git a/object/set.js b/object/set.js new file mode 100644 index 000000000..953169a9c --- /dev/null +++ b/object/set.js @@ -0,0 +1,55 @@ +import isIndex from '../internal/isIndex'; +import isKey from '../internal/isKey'; +import isObject from '../lang/isObject'; +import toPath from '../internal/toPath'; + +/** + * Sets the property value of `path` on `object`. If a portion of `path` + * does not exist it is created. + * + * @static + * @memberOf _ + * @category Object + * @param {Object} object The object to augment. + * @param {Array|string} path The path of the property to set. + * @param {*} value The value to set. + * @returns {Object} Returns `object`. + * @example + * + * var object = { 'a': [{ 'b': { 'c': 3 } }] }; + * + * _.set(object, 'a[0].b.c', 4); + * console.log(object.a[0].b.c); + * // => 4 + * + * _.set(object, 'x[0].y.z', 5); + * console.log(object.x[0].y.z); + * // => 5 + */ +function set(object, path, value) { + if (object == null) { + return object; + } + var pathKey = (path + ''); + path = (object[pathKey] != null || isKey(path, object)) ? [pathKey] : toPath(path); + + var index = -1, + length = path.length, + endIndex = length - 1, + nested = object; + + while (nested != null && ++index < length) { + var key = path[index]; + if (isObject(nested)) { + if (index == endIndex) { + nested[key] = value; + } else if (nested[key] == null) { + nested[key] = isIndex(path[index + 1]) ? [] : {}; + } + } + nested = nested[key]; + } + return object; +} + +export default set; diff --git a/object/transform.js b/object/transform.js index 5bcce8119..b2fdf9fed 100644 --- a/object/transform.js +++ b/object/transform.js @@ -12,7 +12,7 @@ import isTypedArray from '../lang/isTypedArray'; * `accumulator` object which is the result of running each of its own enumerable * properties through `iteratee`, with each invocation potentially mutating * the `accumulator` object. The `iteratee` is bound to `thisArg` and invoked - * with four arguments: (accumulator, value, key, object). Iterator functions + * with four arguments: (accumulator, value, key, object). Iteratee functions * may exit iteration early by explicitly returning `false`. * * @static diff --git a/package.json b/package.json index a8b653ca0..16cf62d9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lodash-es", - "version": "3.6.0", + "version": "3.7.0", "description": "The modern build of lodash exported as ES modules.", "homepage": "https://lodash.com/custom-builds", "license": "MIT", diff --git a/string/deburr.js b/string/deburr.js index 3976f6a87..88d3573e8 100644 --- a/string/deburr.js +++ b/string/deburr.js @@ -1,10 +1,8 @@ import baseToString from '../internal/baseToString'; import deburrLetter from '../internal/deburrLetter'; -/** - * Used to match [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks). - */ -var reComboMarks = /[\u0300-\u036f\ufe20-\ufe23]/g; +/** Used to match [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks). */ +var reComboMark = /[\u0300-\u036f\ufe20-\ufe23]/g; /** Used to match latin-1 supplementary letters (excluding mathematical operators). */ var reLatin1 = /[\xc0-\xd6\xd8-\xde\xdf-\xf6\xf8-\xff]/g; @@ -25,7 +23,7 @@ var reLatin1 = /[\xc0-\xd6\xd8-\xde\xdf-\xf6\xf8-\xff]/g; */ function deburr(string) { string = baseToString(string); - return string && string.replace(reLatin1, deburrLetter).replace(reComboMarks, ''); + return string && string.replace(reLatin1, deburrLetter).replace(reComboMark, ''); } export default deburr; diff --git a/string/endsWith.js b/string/endsWith.js index a40c1dd6d..217efb714 100644 --- a/string/endsWith.js +++ b/string/endsWith.js @@ -29,7 +29,7 @@ function endsWith(string, target, position) { target = (target + ''); var length = string.length; - position = typeof position == 'undefined' + position = position === undefined ? length : nativeMin(position < 0 ? 0 : (+position || 0), length); diff --git a/string/escape.js b/string/escape.js index ddf588967..a373eaa9a 100644 --- a/string/escape.js +++ b/string/escape.js @@ -19,9 +19,10 @@ var reUnescapedHtml = /[&<>"'`]/g, * (under "semi-related fun fact") for more details. * * Backticks are escaped because in Internet Explorer < 9, they can break out - * of attribute values or HTML comments. See [#102](https://html5sec.org/#102), - * [#108](https://html5sec.org/#108), and [#133](https://html5sec.org/#133) of - * the [HTML5 Security Cheatsheet](https://html5sec.org/) for more details. + * of attribute values or HTML comments. See [#59](https://html5sec.org/#59), + * [#102](https://html5sec.org/#102), [#108](https://html5sec.org/#108), and + * [#133](https://html5sec.org/#133) of the [HTML5 Security Cheatsheet](https://html5sec.org/) + * for more details. * * When working with HTML you should always [quote attribute values](http://wonko.com/post/html-escaping) * to reduce XSS vectors. diff --git a/string/parseInt.js b/string/parseInt.js index a9a9b0ab2..6fcf6e966 100644 --- a/string/parseInt.js +++ b/string/parseInt.js @@ -3,7 +3,7 @@ import root from '../internal/root'; import trim from './trim'; /** Used to detect hexadecimal string values. */ -var reHexPrefix = /^0[xX]/; +var reHasHexPrefix = /^0[xX]/; /** Used to detect and test for whitespace. */ var whitespace = ( @@ -61,7 +61,7 @@ if (nativeParseInt(whitespace + '08') != 8) { radix = +radix; } string = trim(string); - return nativeParseInt(string, radix || (reHexPrefix.test(string) ? 16 : 10)); + return nativeParseInt(string, radix || (reHasHexPrefix.test(string) ? 16 : 10)); }; } diff --git a/string/template.js b/string/template.js index e987c78d2..1c9b82f92 100644 --- a/string/template.js +++ b/string/template.js @@ -1,4 +1,5 @@ import assignOwnDefaults from '../internal/assignOwnDefaults'; +import assignWith from '../internal/assignWith'; import attempt from '../utility/attempt'; import baseAssign from '../internal/baseAssign'; import baseToString from '../internal/baseToString'; @@ -15,9 +16,7 @@ var reEmptyStringLeading = /\b__p \+= '';/g, reEmptyStringMiddle = /\b(__p \+=) '' \+/g, reEmptyStringTrailing = /(__e\(.*?\)|\b__t\)) \+\n'';/g; -/** - * Used to match [ES template delimiters](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-template-literal-lexical-components). - */ +/** Used to match [ES template delimiters](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-template-literal-lexical-components). */ var reEsTemplate = /\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g; /** Used to ensure capturing order of template delimiters. */ @@ -131,9 +130,9 @@ function template(string, options, otherOptions) { options = otherOptions = null; } string = baseToString(string); - options = baseAssign(baseAssign({}, otherOptions || options), settings, assignOwnDefaults); + options = assignWith(baseAssign({}, otherOptions || options), settings, assignOwnDefaults); - var imports = baseAssign(baseAssign({}, options.imports), settings.imports, assignOwnDefaults), + var imports = assignWith(baseAssign({}, options.imports), settings.imports, assignOwnDefaults), importsKeys = keys(imports), importsValues = baseValues(imports, importsKeys); diff --git a/support.js b/support.js index 85f645c60..8a0791918 100644 --- a/support.js +++ b/support.js @@ -19,6 +19,12 @@ var propertyIsEnumerable = objectProto.propertyIsEnumerable; var support = {}; (function(x) { + var Ctor = function() { this.x = x; }, + object = { '0': x, 'length': x }, + props = []; + + Ctor.prototype = { 'valueOf': x, 'y': x }; + for (var key in new Ctor) { props.push(key); } /** * Detect if functions can be decompiled by `Function#toString` @@ -56,8 +62,8 @@ var support = {}; * In Firefox < 4, IE < 9, PhantomJS, and Safari < 5.1 `arguments` object * indexes are non-enumerable. Chrome < 25 and Node.js < 0.11.0 treat * `arguments` object indexes as non-enumerable and fail `hasOwnProperty` - * checks for indexes that exceed their function's formal parameters with - * associated values of `0`. + * checks for indexes that exceed the number of function parameters and + * whose associated argument values are `0`. * * @memberOf _.support * @type boolean @@ -67,6 +73,6 @@ var support = {}; } catch(e) { support.nonEnumArgs = true; } -}(0, 0)); +}(1, 0)); export default support; diff --git a/utility.js b/utility.js index 7ec948f6d..dd47a8245 100644 --- a/utility.js +++ b/utility.js @@ -5,6 +5,8 @@ import identity from './utility/identity'; import iteratee from './utility/iteratee'; import matches from './utility/matches'; import matchesProperty from './utility/matchesProperty'; +import method from './utility/method'; +import methodOf from './utility/methodOf'; import mixin from './utility/mixin'; import noop from './utility/noop'; import property from './utility/property'; @@ -21,6 +23,8 @@ export default { 'iteratee': iteratee, 'matches': matches, 'matchesProperty': matchesProperty, + 'method': method, + 'methodOf': methodOf, 'mixin': mixin, 'noop': noop, 'property': property, diff --git a/utility/callback.js b/utility/callback.js index 48834cb46..92d5160cd 100644 --- a/utility/callback.js +++ b/utility/callback.js @@ -1,7 +1,5 @@ import baseCallback from '../internal/baseCallback'; import isIterateeCall from '../internal/isIterateeCall'; -import isObjectLike from '../internal/isObjectLike'; -import matches from './matches'; /** * Creates a function that invokes `func` with the `this` binding of `thisArg` @@ -45,9 +43,7 @@ function callback(func, thisArg, guard) { if (guard && isIterateeCall(func, thisArg, guard)) { thisArg = null; } - return isObjectLike(func) - ? matches(func) - : baseCallback(func, thisArg); + return baseCallback(func, thisArg); } export default callback; diff --git a/utility/matchesProperty.js b/utility/matchesProperty.js index 30594c59f..4461dc4ab 100644 --- a/utility/matchesProperty.js +++ b/utility/matchesProperty.js @@ -2,7 +2,7 @@ import baseClone from '../internal/baseClone'; import baseMatchesProperty from '../internal/baseMatchesProperty'; /** - * Creates a function which compares the property value of `key` on a given + * Creates a function which compares the property value of `path` on a given * object to `value`. * * **Note:** This method supports comparing arrays, booleans, `Date` objects, @@ -12,7 +12,7 @@ import baseMatchesProperty from '../internal/baseMatchesProperty'; * @static * @memberOf _ * @category Utility - * @param {string} key The key of the property to get. + * @param {Array|string} path The path of the property to get. * @param {*} value The value to compare. * @returns {Function} Returns the new function. * @example @@ -25,8 +25,8 @@ import baseMatchesProperty from '../internal/baseMatchesProperty'; * _.find(users, _.matchesProperty('user', 'fred')); * // => { 'user': 'fred' } */ -function matchesProperty(key, value) { - return baseMatchesProperty(key + '', baseClone(value, true)); +function matchesProperty(path, value) { + return baseMatchesProperty(path, baseClone(value, true)); } export default matchesProperty; diff --git a/utility/method.js b/utility/method.js new file mode 100644 index 000000000..362ebfe8c --- /dev/null +++ b/utility/method.js @@ -0,0 +1,31 @@ +import invokePath from '../internal/invokePath'; +import restParam from '../function/restParam'; + +/** + * Creates a function which invokes the method at `path` on a given object. + * + * @static + * @memberOf _ + * @category Utility + * @param {Array|string} path The path of the method to invoke. + * @returns {Function} Returns the new function. + * @example + * + * var objects = [ + * { 'a': { 'b': { 'c': _.constant(2) } } }, + * { 'a': { 'b': { 'c': _.constant(1) } } } + * ]; + * + * _.map(objects, _.method('a.b.c')); + * // => [2, 1] + * + * _.invoke(_.sortBy(objects, _.method(['a', 'b', 'c'])), 'a.b.c'); + * // => [1, 2] + */ +var method = restParam(function(path, args) { + return function(object) { + return invokePath(object, path, args); + } +}); + +export default method; diff --git a/utility/methodOf.js b/utility/methodOf.js new file mode 100644 index 000000000..a08d572ca --- /dev/null +++ b/utility/methodOf.js @@ -0,0 +1,30 @@ +import invokePath from '../internal/invokePath'; +import restParam from '../function/restParam'; + +/** + * The opposite of `_.method`; this method creates a function which invokes + * the method at a given path on `object`. + * + * @static + * @memberOf _ + * @category Utility + * @param {Object} object The object to query. + * @returns {Function} Returns the new function. + * @example + * + * var array = _.times(3, _.constant), + * object = { 'a': array, 'b': array, 'c': array }; + * + * _.map(['a[2]', 'c[0]'], _.methodOf(object)); + * // => [2, 0] + * + * _.map([['a', '2'], ['c', '0']], _.methodOf(object)); + * // => [2, 0] + */ +var methodOf = restParam(function(object, args) { + return function(path) { + return invokePath(object, path, args); + }; +}); + +export default methodOf; diff --git a/utility/mixin.js b/utility/mixin.js index 45f05b3a3..c65c08e5f 100644 --- a/utility/mixin.js +++ b/utility/mixin.js @@ -15,13 +15,13 @@ var push = arrayProto.push; * destination object. If `object` is a function then methods are added to * its prototype as well. * - * **Note:** Use `_.runInContext` to create a pristine `lodash` function - * for mixins to avoid conflicts caused by modifying the original. + * **Note:** Use `_.runInContext` to create a pristine `lodash` function to + * avoid conflicts caused by modifying the original. * * @static * @memberOf _ * @category Utility - * @param {Function|Object} [object=this] object The destination object. + * @param {Function|Object} [object=lodash] The destination object. * @param {Object} source The object of functions to add. * @param {Object} [options] The options object. * @param {boolean} [options.chain=true] Specify whether the functions added diff --git a/utility/property.js b/utility/property.js index 30745eee4..c0e131d3f 100644 --- a/utility/property.js +++ b/utility/property.js @@ -1,30 +1,31 @@ import baseProperty from '../internal/baseProperty'; +import basePropertyDeep from '../internal/basePropertyDeep'; +import isKey from '../internal/isKey'; /** - * Creates a function which returns the property value of `key` on a given object. + * Creates a function which returns the property value at `path` on a + * given object. * * @static * @memberOf _ * @category Utility - * @param {string} key The key of the property to get. + * @param {Array|string} path The path of the property to get. * @returns {Function} Returns the new function. * @example * - * var users = [ - * { 'user': 'fred' }, - * { 'user': 'barney' } + * var objects = [ + * { 'a': { 'b': { 'c': 2 } } }, + * { 'a': { 'b': { 'c': 1 } } } * ]; * - * var getName = _.property('user'); + * _.map(objects, _.property('a.b.c')); + * // => [2, 1] * - * _.map(users, getName); - * // => ['fred', 'barney'] - * - * _.pluck(_.sortBy(users, getName), 'user'); - * // => ['barney', 'fred'] + * _.pluck(_.sortBy(objects, _.property(['a', 'b', 'c'])), 'a.b.c'); + * // => [1, 2] */ -function property(key) { - return baseProperty(key + ''); +function property(path) { + return isKey(path) ? baseProperty(path) : basePropertyDeep(path); } export default property; diff --git a/utility/propertyOf.js b/utility/propertyOf.js index 6fa91f2ea..89106afa1 100644 --- a/utility/propertyOf.js +++ b/utility/propertyOf.js @@ -1,25 +1,29 @@ +import baseGet from '../internal/baseGet'; +import toPath from '../internal/toPath'; + /** * The opposite of `_.property`; this method creates a function which returns - * the property value of a given key on `object`. + * the property value at a given path on `object`. * * @static * @memberOf _ * @category Utility - * @param {Object} object The object to inspect. + * @param {Object} object The object to query. * @returns {Function} Returns the new function. * @example * - * var object = { 'a': 3, 'b': 1, 'c': 2 }; + * var array = [0, 1, 2], + * object = { 'a': array, 'b': array, 'c': array }; * - * _.map(['a', 'c'], _.propertyOf(object)); - * // => [3, 2] + * _.map(['a[2]', 'c[0]'], _.propertyOf(object)); + * // => [2, 0] * - * _.sortBy(['a', 'b', 'c'], _.propertyOf(object)); - * // => ['b', 'c', 'a'] + * _.map([['a', '2'], ['c', '0']], _.propertyOf(object)); + * // => [2, 0] */ function propertyOf(object) { - return function(key) { - return object == null ? undefined : object[key]; + return function(path) { + return baseGet(object, toPath(path), path + ''); }; } diff --git a/utility/range.js b/utility/range.js index dedcdbc04..211c2b42a 100644 --- a/utility/range.js +++ b/utility/range.js @@ -9,7 +9,7 @@ var nativeMax = Math.max; /** * Creates an array of numbers (positive and/or negative) progressing from * `start` up to, but not including, `end`. If `end` is not specified it is - * set to `start` with `start` then set to `0`. If `start` is less than `end` + * set to `start` with `start` then set to `0`. If `end` is less than `start` * a zero-length range is created unless a negative `step` is specified. * * @static diff --git a/utility/times.js b/utility/times.js index 2e046f96c..efa4945b6 100644 --- a/utility/times.js +++ b/utility/times.js @@ -1,6 +1,9 @@ import bindCallback from '../internal/bindCallback'; import root from '../internal/root'; +/** Native method references. */ +var floor = Math.floor; + /* Native method references for those with the same name as other `lodash` methods. */ var nativeIsFinite = root.isFinite, nativeMin = Math.min; @@ -28,7 +31,7 @@ var MAX_ARRAY_LENGTH = Math.pow(2, 32) - 1; * _.times(3, function(n) { * mage.castSpell(n); * }); - * // => invokes `mage.castSpell(n)` three times with `n` of `0`, `1`, and `2` respectively + * // => invokes `mage.castSpell(n)` three times with `n` of `0`, `1`, and `2` * * _.times(3, function(n) { * this.cast(n); @@ -36,7 +39,7 @@ var MAX_ARRAY_LENGTH = Math.pow(2, 32) - 1; * // => also invokes `mage.castSpell(n)` three times */ function times(n, iteratee, thisArg) { - n = +n; + n = floor(n); // Exit early to avoid a JSC JIT bug in Safari 8 // where `Array(0)` is treated as `Array(1)`.