From ee1f12c85178cc836b80b3a420a5900d59f4076b Mon Sep 17 00:00:00 2001 From: jdalton Date: Sun, 8 Mar 2015 18:09:08 -0700 Subject: [PATCH] Bump to v3.5.0. --- README.md | 4 +-- array/indexOf.js | 5 +++- array/lastIndexOf.js | 5 +++- chain/lodash.js | 11 ++++++-- collection/sortByOrder.js | 5 ++-- internal/baseAssign.js | 2 +- internal/baseFill.js | 2 +- internal/baseMerge.js | 2 +- internal/baseMergeDeep.js | 2 +- internal/baseSlice.js | 2 +- internal/compareMultiple.js | 3 +- internal/createBindWrapper.js | 4 ++- internal/createComposer.js | 2 +- internal/createHybridWrapper.js | 4 ++- internal/createPartialWrapper.js | 4 ++- internal/equalObjects.js | 6 ++-- internal/extremumBy.js | 3 +- internal/isIterateeCall.js | 2 +- internal/lazyClone.js | 1 - internal/lazyValue.js | 47 +++++++++++++++++--------------- lang/isElement.js | 2 +- lodash.js | 45 +++++++++++++++++++----------- object/keys.js | 2 +- package.json | 2 +- string/endsWith.js | 6 +++- string/startsWith.js | 5 +++- string/trunc.js | 2 +- utility/attempt.js | 2 +- utility/mixin.js | 6 +++- 29 files changed, 117 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index 5a4b3c627..546368977 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# lodash-es v3.4.0 +# lodash-es v3.5.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.4.0-es) for more details. +See the [package source](https://github.com/lodash/lodash/tree/3.5.0-es) for more details. diff --git a/array/indexOf.js b/array/indexOf.js index a92895fb4..a3c4edf7f 100644 --- a/array/indexOf.js +++ b/array/indexOf.js @@ -47,7 +47,10 @@ function indexOf(array, value, fromIndex) { var index = binaryIndex(array, value), other = array[index]; - return (value === value ? value === other : other !== other) ? index : -1; + if (value === value ? (value === other) : (other !== other)) { + return index; + } + return -1; } return baseIndexOf(array, value, fromIndex || 0); } diff --git a/array/lastIndexOf.js b/array/lastIndexOf.js index 284d58e02..f7b1c4cd7 100644 --- a/array/lastIndexOf.js +++ b/array/lastIndexOf.js @@ -41,7 +41,10 @@ function lastIndexOf(array, value, fromIndex) { } else if (fromIndex) { index = binaryIndex(array, value, true) - 1; var other = array[index]; - return (value === value ? value === other : other !== other) ? index : -1; + if (value === value ? (value === other) : (other !== other)) { + return index; + } + return -1; } if (value !== value) { return indexOfNaN(array, index, true); diff --git a/chain/lodash.js b/chain/lodash.js index 31ccb31eb..e017f806e 100644 --- a/chain/lodash.js +++ b/chain/lodash.js @@ -27,9 +27,14 @@ var hasOwnProperty = objectProto.hasOwnProperty; * Chaining is supported in custom builds as long as the `_#value` method is * directly or indirectly included in the build. * - * In addition to lodash methods, wrappers also have the following `Array` methods: - * `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`, `splice`, - * and `unshift` + * In addition to lodash methods, wrappers have `Array` and `String` methods. + * + * The wrapper `Array` methods are: + * `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`, + * `splice`, and `unshift` + * + * The wrapper `String` methods are: + * `replace` and `split` * * The wrapper methods that support shortcut fusion are: * `compact`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`, diff --git a/collection/sortByOrder.js b/collection/sortByOrder.js index b226e1933..9f1bde702 100644 --- a/collection/sortByOrder.js +++ b/collection/sortByOrder.js @@ -14,13 +14,14 @@ import isIterateeCall from '../internal/isIterateeCall'; * @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- {Object} [guard] Enables use as a callback for functions like `_.reduce`. * @returns {Array} Returns the new sorted array. * @example * * var users = [ - * { 'user': 'barney', 'age': 36 }, - * { 'user': 'fred', 'age': 40 }, * { 'user': 'barney', 'age': 26 }, + * { 'user': 'fred', 'age': 40 }, + * { 'user': 'barney', 'age': 36 }, * { 'user': 'fred', 'age': 30 } * ]; * diff --git a/internal/baseAssign.js b/internal/baseAssign.js index 53eae6349..7b963761e 100644 --- a/internal/baseAssign.js +++ b/internal/baseAssign.js @@ -24,7 +24,7 @@ function baseAssign(object, source, customizer) { value = object[key], result = customizer(value, source[key], key, object, source); - if ((result === result ? result !== value : value === value) || + if ((result === result ? (result !== value) : (value === value)) || (typeof value == 'undefined' && !(key in object))) { object[key] = result; } diff --git a/internal/baseFill.js b/internal/baseFill.js index 458c80d04..3b95d273b 100644 --- a/internal/baseFill.js +++ b/internal/baseFill.js @@ -19,7 +19,7 @@ function baseFill(array, value, start, end) { if (end < 0) { end += length; } - length = start > end ? 0 : end >>> 0; + length = start > end ? 0 : (end >>> 0); start >>>= 0; while (start < length) { diff --git a/internal/baseMerge.js b/internal/baseMerge.js index 410ce7610..e36ed0ea0 100644 --- a/internal/baseMerge.js +++ b/internal/baseMerge.js @@ -38,7 +38,7 @@ function baseMerge(object, source, customizer, stackA, stackB) { result = srcValue; } if ((isSrcArr || typeof result != 'undefined') && - (isCommon || (result === result ? result !== value : value === value))) { + (isCommon || (result === result ? (result !== value) : (value === value)))) { object[key] = result; } }); diff --git a/internal/baseMergeDeep.js b/internal/baseMergeDeep.js index 40f77a8fb..5bce59b04 100644 --- a/internal/baseMergeDeep.js +++ b/internal/baseMergeDeep.js @@ -59,7 +59,7 @@ function baseMergeDeep(object, source, key, mergeFunc, customizer, stackA, stack if (isCommon) { // Recursively merge objects and arrays (susceptible to call stack limits). object[key] = mergeFunc(result, srcValue, customizer, stackA, stackB); - } else if (result === result ? result !== value : value === value) { + } else if (result === result ? (result !== value) : (value === value)) { object[key] = result; } } diff --git a/internal/baseSlice.js b/internal/baseSlice.js index 9f870d4ec..c9fe3a36f 100644 --- a/internal/baseSlice.js +++ b/internal/baseSlice.js @@ -19,7 +19,7 @@ function baseSlice(array, start, end) { if (end < 0) { end += length; } - length = start > end ? 0 : (end - start) >>> 0; + length = start > end ? 0 : ((end - start) >>> 0); start >>>= 0; var result = Array(length); diff --git a/internal/compareMultiple.js b/internal/compareMultiple.js index 91020a8ae..a148dd15a 100644 --- a/internal/compareMultiple.js +++ b/internal/compareMultiple.js @@ -26,9 +26,8 @@ function compareMultiple(object, other, orders) { if (result) { if (index >= ordersLength) { return result; - } else { - return orders[index] ? result : result * -1; } + return result * (orders[index] ? 1 : -1); } } // Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications diff --git a/internal/createBindWrapper.js b/internal/createBindWrapper.js index 99a175ddb..19cd166ce 100644 --- a/internal/createBindWrapper.js +++ b/internal/createBindWrapper.js @@ -1,4 +1,5 @@ import createCtorWrapper from './createCtorWrapper'; +import root from './root'; /** * Creates a function that wraps `func` and invokes it with the `this` @@ -13,7 +14,8 @@ function createBindWrapper(func, thisArg) { var Ctor = createCtorWrapper(func); function wrapper() { - return (this instanceof wrapper ? Ctor : func).apply(thisArg, arguments); + var fn = (this && this !== root && this instanceof wrapper) ? Ctor : func; + return fn.apply(thisArg, arguments); } return wrapper; } diff --git a/internal/createComposer.js b/internal/createComposer.js index f0be26990..2727f3603 100644 --- a/internal/createComposer.js +++ b/internal/createComposer.js @@ -12,7 +12,7 @@ function createComposer(fromRight) { return function() { var length = arguments.length, index = length, - fromIndex = fromRight ? length - 1 : 0; + fromIndex = fromRight ? (length - 1) : 0; if (!length) { return function() { return arguments[0]; }; diff --git a/internal/createHybridWrapper.js b/internal/createHybridWrapper.js index 97ddc14e2..4c2ca6869 100644 --- a/internal/createHybridWrapper.js +++ b/internal/createHybridWrapper.js @@ -4,6 +4,7 @@ import composeArgsRight from './composeArgsRight'; import createCtorWrapper from './createCtorWrapper'; import reorder from './reorder'; import replaceHolders from './replaceHolders'; +import root from './root'; /** Used to compose bitmasks for wrapper metadata. */ var BIND_FLAG = 1, @@ -96,7 +97,8 @@ function createHybridWrapper(func, bitmask, thisArg, partials, holders, partials if (isAry && ary < args.length) { args.length = ary; } - return (this instanceof wrapper ? (Ctor || createCtorWrapper(func)) : func).apply(thisBinding, args); + var fn = (this && this !== root && this instanceof wrapper) ? (Ctor || createCtorWrapper(func)) : func; + return fn.apply(thisBinding, args); } return wrapper; } diff --git a/internal/createPartialWrapper.js b/internal/createPartialWrapper.js index 9c6e8b710..3bd7320c9 100644 --- a/internal/createPartialWrapper.js +++ b/internal/createPartialWrapper.js @@ -1,4 +1,5 @@ import createCtorWrapper from './createCtorWrapper'; +import root from './root'; /** Used to compose bitmasks for wrapper metadata. */ var BIND_FLAG = 1; @@ -34,7 +35,8 @@ function createPartialWrapper(func, bitmask, thisArg, partials) { while (argsLength--) { args[leftIndex++] = arguments[++argsIndex]; } - return (this instanceof wrapper ? Ctor : func).apply(isBind ? thisArg : this, args); + var fn = (this && this !== root && this instanceof wrapper) ? Ctor : func; + return fn.apply(isBind ? thisArg : this, args); } return wrapper; } diff --git a/internal/equalObjects.js b/internal/equalObjects.js index 93f7bea85..9d8da188c 100644 --- a/internal/equalObjects.js +++ b/internal/equalObjects.js @@ -61,8 +61,10 @@ function equalObjects(object, other, equalFunc, customizer, isWhere, stackA, sta othCtor = other.constructor; // Non `Object` object instances with different constructors are not equal. - if (objCtor != othCtor && ('constructor' in object && 'constructor' in other) && - !(typeof objCtor == 'function' && objCtor instanceof objCtor && typeof othCtor == 'function' && othCtor instanceof othCtor)) { + if (objCtor != othCtor && + ('constructor' in object && 'constructor' in other) && + !(typeof objCtor == 'function' && objCtor instanceof objCtor && + typeof othCtor == 'function' && othCtor instanceof othCtor)) { return false; } } diff --git a/internal/extremumBy.js b/internal/extremumBy.js index 9d66150ad..e4388273d 100644 --- a/internal/extremumBy.js +++ b/internal/extremumBy.js @@ -23,7 +23,8 @@ function extremumBy(collection, iteratee, isMin) { baseEach(collection, function(value, index, collection) { var current = iteratee(value, index, collection); - if ((isMin ? current < computed : current > computed) || (current === exValue && current === result)) { + if ((isMin ? (current < computed) : (current > computed)) || + (current === exValue && current === result)) { computed = current; result = value; } diff --git a/internal/isIterateeCall.js b/internal/isIterateeCall.js index ab0925304..e1fc4dd1d 100644 --- a/internal/isIterateeCall.js +++ b/internal/isIterateeCall.js @@ -24,7 +24,7 @@ function isIterateeCall(value, index, object) { } if (prereq) { var other = object[index]; - return value === value ? value === other : other !== other; + return value === value ? (value === other) : (other !== other); } return false; } diff --git a/internal/lazyClone.js b/internal/lazyClone.js index 8f79db195..f941407d7 100644 --- a/internal/lazyClone.js +++ b/internal/lazyClone.js @@ -17,7 +17,6 @@ function lazyClone() { result.__actions__ = actions ? arrayCopy(actions) : null; result.__dir__ = this.__dir__; - result.__dropCount__ = this.__dropCount__; result.__filtered__ = this.__filtered__; result.__iteratees__ = iteratees ? arrayCopy(iteratees) : null; result.__takeCount__ = this.__takeCount__; diff --git a/internal/lazyValue.js b/internal/lazyValue.js index f128f85f6..cbc123101 100644 --- a/internal/lazyValue.js +++ b/internal/lazyValue.js @@ -4,8 +4,8 @@ import isArray from '../lang/isArray'; /** Used to indicate the type of lazy iteratees. */ var LAZY_DROP_WHILE_FLAG = 0, - LAZY_MAP_FLAG = 2, - LAZY_TAKE_WHILE_FLAG = 3; + LAZY_FILTER_FLAG = 1, + LAZY_MAP_FLAG = 2; /* Native method references for those with the same name as other `lodash` methods. */ var nativeMin = Math.min; @@ -29,9 +29,8 @@ function lazyValue() { start = view.start, end = view.end, length = end - start, - dropCount = this.__dropCount__, + index = isRight ? end : (start - 1), takeCount = nativeMin(length, this.__takeCount__), - index = isRight ? end : start - 1, iteratees = this.__iteratees__, iterLength = iteratees ? iteratees.length : 0, resIndex = 0, @@ -49,28 +48,32 @@ function lazyValue() { iteratee = data.iteratee, type = data.type; - if (type != LAZY_DROP_WHILE_FLAG) { - var computed = iteratee(value); - } else { - data.done = data.done && (isRight ? index < data.index : index > data.index); + if (type == LAZY_DROP_WHILE_FLAG) { + if (data.done && (isRight ? (index > data.index) : (index < data.index))) { + data.count = 0; + data.done = false; + } data.index = index; - computed = data.done || (data.done = !iteratee(value)); - } - if (type == LAZY_MAP_FLAG) { - value = computed; - } else if (!computed) { - if (type == LAZY_TAKE_WHILE_FLAG) { - break outer; - } else { - continue outer; + if (!data.done) { + var limit = data.limit; + if (!(data.done = limit > -1 ? (data.count++ >= limit) : !iteratee(value))) { + continue outer; + } + } + } else { + var computed = iteratee(value); + if (type == LAZY_MAP_FLAG) { + value = computed; + } else if (!computed) { + if (type == LAZY_FILTER_FLAG) { + continue outer; + } else { + break outer; + } } } } - if (dropCount) { - dropCount--; - } else { - result[resIndex++] = value; - } + result[resIndex++] = value; } return result; } diff --git a/lang/isElement.js b/lang/isElement.js index c24386e84..d853b62bc 100644 --- a/lang/isElement.js +++ b/lang/isElement.js @@ -30,7 +30,7 @@ var objToString = objectProto.toString; */ function isElement(value) { return (value && value.nodeType === 1 && isObjectLike(value) && - objToString.call(value).indexOf('Element') > -1) || false; + (objToString.call(value).indexOf('Element') > -1)) || false; } // Fallback for environments without DOM support. if (!support.dom) { diff --git a/lodash.js b/lodash.js index a49d964f7..1ca5bcda2 100644 --- a/lodash.js +++ b/lodash.js @@ -1,6 +1,6 @@ /** * @license - * lodash 3.4.0 (Custom Build) + * lodash 3.5.0 (Custom Build) * Build: `lodash modularize modern exports="es" -o ./` * Copyright 2012-2015 The Dojo Foundation * Based on Underscore.js 1.8.2 @@ -30,6 +30,7 @@ import identity from './utility/identity'; import isArray from './lang/isArray'; import isObject from './lang/isObject'; import keys from './object/keys'; +import last from './array/last'; import lazyClone from './internal/lazyClone'; import lazyReverse from './internal/lazyReverse'; import lazyValue from './internal/lazyValue'; @@ -39,14 +40,15 @@ import support from './support'; import thru from './chain/thru'; /** Used as the semantic version number. */ -var VERSION = '3.4.0'; +var VERSION = '3.5.0'; /** Used to indicate the type of lazy iteratees. */ var LAZY_DROP_WHILE_FLAG = 0, LAZY_MAP_FLAG = 2; /** Used for native method references. */ -var arrayProto = Array.prototype; +var arrayProto = Array.prototype, + stringProto = String.prototype; /** Native method references. */ var floor = Math.floor, @@ -240,7 +242,7 @@ lodash.isString = lang.isString; lodash.isTypedArray = lang.isTypedArray; lodash.isUndefined = lang.isUndefined; lodash.kebabCase = string.kebabCase; -lodash.last = array.last; +lodash.last = last; lodash.lastIndexOf = array.lastIndexOf; lodash.max = math.max; lodash.min = math.min; @@ -332,24 +334,35 @@ arrayEach(['dropWhile', 'filter', 'map', 'takeWhile'], function(methodName, type result = (filtered && isDropWhile) ? new LazyWrapper(this) : this.clone(), iteratees = result.__iteratees__ || (result.__iteratees__ = []); + iteratees.push({ + 'done': false, + 'count': 0, + 'index': 0, + 'iteratee': baseCallback(iteratee, thisArg, 1), + 'limit': -1, + 'type': type + }); + result.__filtered__ = filtered || isFilter; - iteratees.push({ 'done': false, 'index': 0, 'iteratee': baseCallback(iteratee, thisArg, 1), 'type': type }); return result; }; }); // Add `LazyWrapper` methods for `_.drop` and `_.take` variants. arrayEach(['drop', 'take'], function(methodName, index) { - var countName = '__' + methodName + 'Count__', - whileName = methodName + 'While'; + var whileName = methodName + 'While'; LazyWrapper.prototype[methodName] = function(n) { - n = n == null ? 1 : nativeMax(floor(n) || 0, 0); + var filtered = this.__filtered__, + result = (filtered && !index) ? this.dropWhile() : this.clone(); - var result = this.clone(); - if (result.__filtered__) { - var value = result[countName]; - result[countName] = index ? nativeMin(value, n) : (value + n); + n = n == null ? 1 : nativeMax(floor(n) || 0, 0); + if (filtered) { + if (index) { + result.__takeCount__ = nativeMin(result.__takeCount__, n); + } else { + last(result.__iteratees__).limit = n; + } } else { var views = result.__views__ || (result.__views__ = []); views.push({ 'size': n, 'type': methodName + (result.__dir__ < 0 ? 'Right' : '') }); @@ -465,11 +478,11 @@ baseForOwn(LazyWrapper.prototype, function(func, methodName) { }; }); -// Add `Array.prototype` functions to `lodash.prototype`. -arrayEach(['concat', 'join', 'pop', 'push', 'shift', 'sort', 'splice', 'unshift'], function(methodName) { - var func = arrayProto[methodName], +// Add `Array` and `String` methods to `lodash.prototype`. +arrayEach(['concat', 'join', 'pop', 'push', 'replace', 'shift', 'sort', 'splice', 'split', 'unshift'], function(methodName) { + var func = (/^(?:replace|split)$/.test(methodName) ? stringProto : arrayProto)[methodName], chainName = /^(?:push|sort|unshift)$/.test(methodName) ? 'tap' : 'thru', - retUnwrapped = /^(?:join|pop|shift)$/.test(methodName); + retUnwrapped = /^(?:join|pop|replace|shift)$/.test(methodName); lodash.prototype[methodName] = function() { var args = arguments; diff --git a/object/keys.js b/object/keys.js index cf2d57d26..c55c5af65 100644 --- a/object/keys.js +++ b/object/keys.js @@ -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' && (length && isLength(length)))) { return shimKeys(object); } return isObject(object) ? nativeKeys(object) : []; diff --git a/package.json b/package.json index 364370f75..cb2d24f6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lodash-es", - "version": "3.4.0", + "version": "3.5.0", "description": "The modern build of lodash exported as ES modules.", "homepage": "https://lodash.com/custom-builds", "license": "MIT", diff --git a/string/endsWith.js b/string/endsWith.js index de586fe4c..a40c1dd6d 100644 --- a/string/endsWith.js +++ b/string/endsWith.js @@ -29,7 +29,11 @@ function endsWith(string, target, position) { target = (target + ''); var length = string.length; - position = (typeof position == 'undefined' ? length : nativeMin(position < 0 ? 0 : (+position || 0), length)) - target.length; + position = typeof position == 'undefined' + ? length + : nativeMin(position < 0 ? 0 : (+position || 0), length); + + position -= target.length; return position >= 0 && string.indexOf(target, position) == position; } diff --git a/string/startsWith.js b/string/startsWith.js index 94723f802..df9a92862 100644 --- a/string/startsWith.js +++ b/string/startsWith.js @@ -26,7 +26,10 @@ var nativeMin = Math.min; */ function startsWith(string, target, position) { string = baseToString(string); - position = position == null ? 0 : nativeMin(position < 0 ? 0 : (+position || 0), string.length); + position = position == null + ? 0 + : nativeMin(position < 0 ? 0 : (+position || 0), string.length); + return string.lastIndexOf(target, position) == position; } diff --git a/string/trunc.js b/string/trunc.js index a9ebfaab6..0762523fd 100644 --- a/string/trunc.js +++ b/string/trunc.js @@ -60,7 +60,7 @@ function trunc(string, options, guard) { if (options != null) { if (isObject(options)) { var separator = 'separator' in options ? options.separator : separator; - length = 'length' in options ? +options.length || 0 : length; + length = 'length' in options ? (+options.length || 0) : length; omission = 'omission' in options ? baseToString(options.omission) : omission; } else { length = +options || 0; diff --git a/utility/attempt.js b/utility/attempt.js index b6e26caa9..0cb903790 100644 --- a/utility/attempt.js +++ b/utility/attempt.js @@ -23,7 +23,7 @@ import isError from '../lang/isError'; function attempt() { var func = arguments[0], length = arguments.length, - args = Array(length ? length - 1 : 0); + args = Array(length ? (length - 1) : 0); while (--length > 0) { args[length - 1] = arguments[length]; diff --git a/utility/mixin.js b/utility/mixin.js index 59609efb3..d17e38204 100644 --- a/utility/mixin.js +++ b/utility/mixin.js @@ -70,7 +70,11 @@ function mixin(object, source, options) { var chainAll = this.__chain__; if (chain || chainAll) { var result = object(this.__wrapped__); - (result.__actions__ = arrayCopy(this.__actions__)).push({ 'func': func, 'args': arguments, 'thisArg': object }); + (result.__actions__ = arrayCopy(this.__actions__)).push({ + 'func': func, + 'args': arguments, + 'thisArg': object + }); result.__chain__ = chainAll; return result; }