Bump to v3.1.0.

2026-02-11 11:27:50 +00:00 · 2015-05-25 16:51:22 -07:00
parent f11f2385a6
commit 27d65e814a
409 changed files with 6049 additions and 3061 deletions
--- a/lodash.where/README.md
+++ b/lodash.where/README.md
@@ -1,4 +1,4 @@
-# lodash.where v3.0.0
+# lodash.where v3.1.0

 The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.where` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.

@@ -17,4 +17,4 @@ In Node.js/io.js:
 var where = require('lodash.where');
 ```

-See the [documentation](https://lodash.com/docs#where) or [package source](https://github.com/lodash/lodash/blob/3.0.0-npm-packages/lodash.where) for more details.
+See the [documentation](https://lodash.com/docs#where) or [package source](https://github.com/lodash/lodash/blob/3.1.0-npm-packages/lodash.where) for more details.
--- a/lodash.where/index.js
+++ b/lodash.where/index.js
@@ -1,5 +1,5 @@
 /**
- * lodash 3.0.0 (Custom Build) <https://lodash.com/>
+ * lodash 3.1.0 (Custom Build) <https://lodash.com/>
 * Build: `lodash modern modularize exports="npm" -o ./`
 * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
 * Based on Underscore.js 1.7.0 <http://underscorejs.org/LICENSE>
@@ -8,127 +8,23 @@
 */
 var arrayFilter = require('lodash._arrayfilter'),
    baseCallback = require('lodash._basecallback'),
-    baseClone = require('lodash._baseclone'),
    baseFilter = require('lodash._basefilter'),
-    baseIsEqual = require('lodash._baseisequal'),
-    isArray = require('lodash.isarray'),
-    keys = require('lodash.keys');
-
-/** Used for native method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * The base implementation of `_.isMatch` without support for callback
- * shorthands or `this` binding.
- *
- * @private
- * @param {Object} source The object to inspect.
- * @param {Array} props The source property names to match.
- * @param {Array} values The source values to match.
- * @param {Array} strictCompareFlags Strict comparison flags for source values.
- * @param {Function} [customizer] The function to customize comparing objects.
- * @returns {boolean} Returns `true` if `object` is a match, else `false`.
- */
-function baseIsMatch(object, props, values, strictCompareFlags, customizer) {
-  var length = props.length;
-  if (object == null) {
-    return !length;
-  }
-  var index = -1,
-      noCustomizer = !customizer;
-
-  while (++index < length) {
-    if ((noCustomizer && strictCompareFlags[index])
-          ? values[index] !== object[props[index]]
-          : !hasOwnProperty.call(object, props[index])
-        ) {
-      return false;
-    }
-  }
-  index = -1;
-  while (++index < length) {
-    var key = props[index];
-    if (noCustomizer && strictCompareFlags[index]) {
-      var result = hasOwnProperty.call(object, key);
-    } else {
-      var objValue = object[key],
-          srcValue = values[index];
-
-      result = customizer ? customizer(objValue, srcValue, key) : undefined;
-      if (typeof result == 'undefined') {
-        result = baseIsEqual(srcValue, objValue, customizer, true);
-      }
-    }
-    if (!result) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * The base implementation of `_.matches` which supports specifying whether
- * `source` should be cloned.
- *
- * @private
- * @param {Object} source The object of property values to match.
- * @param {boolean} [isCloned] Specify cloning the source object.
- * @returns {Function} Returns the new function.
- */
-function baseMatches(source, isCloned) {
-  var props = keys(source),
-      length = props.length;
-
-  if (length == 1) {
-    var key = props[0],
-        value = source[key];
-
-    if (isStrictComparable(value)) {
-      return function(object) {
-        return object != null && value === object[key] && hasOwnProperty.call(object, key);
-      };
-    }
-  }
-  if (isCloned) {
-    source = baseClone(source, true);
-  }
-  var values = Array(length),
-      strictCompareFlags = Array(length);
-
-  while (length--) {
-    value = source[props[length]];
-    values[length] = value;
-    strictCompareFlags[length] = isStrictComparable(value);
-  }
-  return function(object) {
-    return baseIsMatch(object, props, values, strictCompareFlags);
-  };
-}
-
-/**
- * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` if suitable for strict
- *  equality comparisons, else `false`.
- */
-function isStrictComparable(value) {
-  return value === value && (value === 0 ? ((1 / value) > 0) : !isObject(value));
-}
+    baseMatches = require('lodash._basematches'),
+    isArray = require('lodash.isarray');

 /**
 * Iterates over elements of `collection`, returning an array of all elements
 * `predicate` returns truthy for. The predicate is bound to `thisArg` and
- * invoked with three arguments; (value, index|key, collection).
+ * invoked with three arguments: (value, index|key, collection).
 *
- * If a property name is provided for `predicate` the created "_.property"
+ * If a property name is provided for `predicate` the created `_.property`
 * style callback returns the property value of the given element.
 *
- * If an object is provided for `predicate` the created "_.matches" style
+ * If a value is also provided for `thisArg` the created `_.matchesProperty`
+ * style callback returns `true` for elements that have a matching property
+ * value, else `false`.
+ *
+ * If an object is provided for `predicate` the created `_.matches` style
 * callback returns `true` for elements that have the properties of the given
 * object, else `false`.
 *
@@ -138,26 +34,31 @@ function isStrictComparable(value) {
 * @category Collection
 * @param {Array|Object|string} collection The collection to iterate over.
 * @param {Function|Object|string} [predicate=_.identity] The function invoked
- *  per iteration. If a property name or object is provided it is used to
- *  create a "_.property" or "_.matches" style callback respectively.
+ *  per iteration.
 * @param {*} [thisArg] The `this` binding of `predicate`.
 * @returns {Array} Returns the new filtered array.
 * @example
 *
- * var evens = _.filter([1, 2, 3, 4], function(n) { return n % 2 == 0; });
- * // => [2, 4]
+ * _.filter([4, 5, 6], function(n) {
+ *   return n % 2 == 0;
+ * });
+ * // => [4, 6]
 *
 * var users = [
- *   { 'user': 'barney', 'age': 36, 'active': false },
- *   { 'user': 'fred',   'age': 40, 'active': true }
+ *   { 'user': 'barney', 'age': 36, 'active': true },
+ *   { 'user': 'fred',   'age': 40, 'active': false }
 * ];
 *
- * // using the "_.property" callback shorthand
- * _.pluck(_.filter(users, 'active'), 'user');
+ * // using the `_.matches` callback shorthand
+ * _.pluck(_.filter(users, { 'age': 36, 'active': true }), 'user');
+ * // => ['barney']
+ *
+ * // using the `_.matchesProperty` callback shorthand
+ * _.pluck(_.filter(users, 'active', false), 'user');
 * // => ['fred']
 *
- * // using the "_.matches" callback shorthand
- * _.pluck(_.filter(users, { 'age': 36 }), 'user');
+ * // using the `_.property` callback shorthand
+ * _.pluck(_.filter(users, 'active'), 'user');
 * // => ['barney']
 */
 function filter(collection, predicate, thisArg) {
@@ -171,6 +72,11 @@ function filter(collection, predicate, thisArg) {
 * source object, returning an array of all elements that have equivalent
 * property values.
 *
+ * **Note:** This method supports comparing arrays, booleans, `Date` objects,
+ * numbers, `Object` objects, regexes, and strings. Objects are compared by
+ * their own, not inherited, enumerable properties. For comparing a single
+ * own or inherited property value see `_.matchesProperty`.
+ *
 * @static
 * @memberOf _
 * @category Collection
@@ -180,79 +86,18 @@ function filter(collection, predicate, thisArg) {
 * @example
 *
 * var users = [
- *   { 'user': 'barney', 'age': 36, 'status': 'busy', 'pets': ['hoppy'] },
- *   { 'user': 'fred',   'age': 40, 'status': 'busy', 'pets': ['baby puss', 'dino'] }
+ *   { 'user': 'barney', 'age': 36, 'active': false, 'pets': ['hoppy'] },
+ *   { 'user': 'fred',   'age': 40, 'active': true, 'pets': ['baby puss', 'dino'] }
 * ];
 *
- * _.pluck(_.where(users, { 'age': 36 }), 'user');
+ * _.pluck(_.where(users, { 'age': 36, 'active': false }), 'user');
 * // => ['barney']
 *
 * _.pluck(_.where(users, { 'pets': ['dino'] }), 'user');
 * // => ['fred']
- *
- * _.pluck(_.where(users, { 'status': 'busy' }), 'user');
- * // => ['barney', 'fred']
 */
 function where(collection, source) {
-  return filter(collection, matches(source));
-}
-
-/**
- * Checks if `value` is the language type of `Object`.
- * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
- *
- * **Note:** See the [ES5 spec](https://es5.github.io/#x8) for more details.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an object, else `false`.
- * @example
- *
- * _.isObject({});
- * // => true
- *
- * _.isObject([1, 2, 3]);
- * // => true
- *
- * _.isObject(1);
- * // => false
- */
-function isObject(value) {
-  // Avoid a V8 JIT bug in Chrome 19-20.
-  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
-  var type = typeof value;
-  return type == 'function' || (value && type == 'object') || false;
-}
-
-/**
- * Creates a function which performs a deep comparison between a given object
- * and `source`, returning `true` if the given object has equivalent property
- * values, else `false`.
- *
- * @static
- * @memberOf _
- * @category Utility
- * @param {Object} source The object of property values to match.
- * @returns {Function} Returns the new function.
- * @example
- *
- * var users = [
- *   { 'user': 'fred',   'age': 40 },
- *   { 'user': 'barney', 'age': 36 }
- * ];
- *
- * var matchesAge = _.matches({ 'age': 36 });
- *
- * _.filter(users, matchesAge);
- * // => [{ 'user': 'barney', 'age': 36 }]
- *
- * _.find(users, matchesAge);
- * // => { 'user': 'barney', 'age': 36 }
- */
-function matches(source) {
-  return baseMatches(source, true);
+  return filter(collection, baseMatches(source));
 }

 module.exports = where;
--- a/lodash.where/package.json
+++ b/lodash.where/package.json
@@ -1,6 +1,6 @@
 {
  "name": "lodash.where",
-  "version": "3.0.0",
+  "version": "3.1.0",
  "description": "The modern build of lodash’s `_.where` as a module.",
  "homepage": "https://lodash.com/",
  "icon": "https://lodash.com/icon.svg",
@@ -19,10 +19,8 @@
  "dependencies": {
    "lodash._arrayfilter": "^3.0.0",
    "lodash._basecallback": "^3.0.0",
-    "lodash._baseclone": "^3.0.0",
    "lodash._basefilter": "^3.0.0",
-    "lodash._baseisequal": "^3.0.0",
-    "lodash.isarray": "^3.0.0",
-    "lodash.keys": "^3.0.0"
+    "lodash._basematches": "^3.0.0",
+    "lodash.isarray": "^3.0.0"
  }
 }