mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-01 15:57:48 +00:00
Add _.sortByOrder.
This commit is contained in:
112
lodash.src.js
112
lodash.src.js
@@ -469,6 +469,46 @@
|
||||
return object.index - other.index;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
* Otherwise, for each property, sort in ascending order if its corresponding value in
|
||||
* orders is true, and descending order if false.
|
||||
*
|
||||
* @private
|
||||
* @param {Object} object The object to compare to `other`.
|
||||
* @param {Object} other The object to compare to `object`.
|
||||
* @param {boolean[]} orders The order to sort by for each property.
|
||||
* @returns {number} Returns the sort order indicator for `object`.
|
||||
*/
|
||||
function compareMultiple(object, other, orders) {
|
||||
var index = -1,
|
||||
objCriteria = object.criteria,
|
||||
othCriteria = other.criteria,
|
||||
length = objCriteria.length;
|
||||
|
||||
while (++index < length) {
|
||||
var result = baseCompareAscending(objCriteria[index], othCriteria[index]);
|
||||
if (result) {
|
||||
if (typeof orders[index] != 'boolean') {
|
||||
return result;
|
||||
} else {
|
||||
return orders[index] ? result : -1 * result;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications
|
||||
// that causes it, under certain circumstances, to provide the same value for
|
||||
// `object` and `other`. See https://github.com/jashkenas/underscore/pull/1247
|
||||
// for more details.
|
||||
//
|
||||
// This also ensures a stable sort in V8 and other engines.
|
||||
// See https://code.google.com/p/v8/issues/detail?id=90 for more details.
|
||||
return object.index - other.index;
|
||||
}
|
||||
|
||||
/**
|
||||
* Used by `_.deburr` to convert latin-1 supplementary letters to basic latin letters.
|
||||
*
|
||||
@@ -6880,6 +6920,77 @@
|
||||
return baseSortBy(result, compareMultipleAscending);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is like `_.sortByAll` except that it takes an optional
|
||||
* `orders` which can be used to specify sorting orders.
|
||||
*
|
||||
* Sort ascendingly for properties that don't have a corresponding order in `orders`.
|
||||
*
|
||||
* @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 {boolean|boolean[]} orders The orders to sort by.
|
||||
* When not specified, default to true, which sort ascendingly.
|
||||
* @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': 30 }
|
||||
* ];
|
||||
*
|
||||
* // Sort by `user` ascendingly
|
||||
* _.map(_.sortByOrder(users, 'user'), _.values)
|
||||
* _.map(_.sortByOrder(users, ['user']), _.values)
|
||||
* _.map(_.sortByOrder(users, 'user', true), _.values)
|
||||
* // => [['barney', 36], ['barney', 26], ['fred', 40], ['fred', 30]]
|
||||
*
|
||||
* // Sort by 'user' descendingly
|
||||
* _.map(_.sortByOrder(users, ['user'], [false]), _.values);
|
||||
* // => [['fred', 40], ['fred', 30], ['barney', 36], ['barney', 26]]
|
||||
*
|
||||
* // Same as _.sortByAll(users, ['user', 'age'])
|
||||
* _.map(_.sortByOrder(users, ['user', 'age']), _.values);
|
||||
* // => [['barney', 26], ['barney', 36], ['fred', 30], ['fred', 40]]
|
||||
*
|
||||
* // Sort by user ascendingly but age descendingly
|
||||
* _.map(_.sortByOrder(users, ['user', 'age'], [true, false]), _.values);
|
||||
* // => [['barney', 36], ['barney', 26], ['fred', 40], ['fred', 30]]
|
||||
*
|
||||
* // Default to sort 'age' ascendingly
|
||||
* _.map(_.sortByOrder(users, ['user', 'age'], [false]), _.values);
|
||||
* // => [['fred', 30], ['fred', 40], ['barney', 26], ['barney', 36]]
|
||||
*/
|
||||
function sortByOrder(collection) {
|
||||
var args = arguments;
|
||||
|
||||
var index = -1,
|
||||
length = collection ? collection.length : 0,
|
||||
props = baseFlatten(args, false, false, 1),
|
||||
orders = baseFlatten(args, false, false, 2),
|
||||
result = isLength(length) ? Array(length) : [];
|
||||
|
||||
baseEach(collection, function(value) {
|
||||
var length = props.length,
|
||||
criteria = Array(length);
|
||||
|
||||
while (length--) {
|
||||
criteria[length] = value == null
|
||||
? undefined
|
||||
: value[props[length]] || value[props[length].key];
|
||||
}
|
||||
result[++index] = { 'criteria': criteria, 'index': index, 'value': value };
|
||||
});
|
||||
return baseSortBy(result, function(object, other) {
|
||||
return compareMultiple(object, other, orders);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs a deep comparison between each element in `collection` and the
|
||||
* source object, returning an array of all elements that have equivalent
|
||||
@@ -11305,6 +11416,7 @@
|
||||
lodash.slice = slice;
|
||||
lodash.sortBy = sortBy;
|
||||
lodash.sortByAll = sortByAll;
|
||||
lodash.sortByOrder = sortByOrder;
|
||||
lodash.spread = spread;
|
||||
lodash.take = take;
|
||||
lodash.takeRight = takeRight;
|
||||
|
||||
72
test/test.js
72
test/test.js
@@ -13115,6 +13115,73 @@
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
QUnit.module('lodash.sortByOrder');
|
||||
|
||||
(function() {
|
||||
function Pair(a, b, c) {
|
||||
this.a = a;
|
||||
this.b = b;
|
||||
this.c = c;
|
||||
}
|
||||
|
||||
var objects = [
|
||||
{ 'a': 'x', 'b': 3 },
|
||||
{ 'a': 'y', 'b': 4 },
|
||||
{ 'a': 'x', 'b': 1 },
|
||||
{ 'a': 'y', 'b': 2 }
|
||||
];
|
||||
|
||||
var complexObjects = [
|
||||
{ 'a': 'x', 'b': 3, 'c': 'bar' },
|
||||
{ 'a': 'y', 'b': 4, 'c': 'foo' },
|
||||
{ 'a': 'x', 'b': 1, 'c': 'foo' },
|
||||
{ 'a': 'y', 'b': 2, 'c': 'bar' }
|
||||
]
|
||||
|
||||
var stableOrder = [
|
||||
new Pair(1, 1, 1), new Pair(1, 2, 1),
|
||||
new Pair(1, 1, 1), new Pair(1, 2, 1),
|
||||
new Pair(1, 3, 1), new Pair(1, 4, 1),
|
||||
new Pair(1, 5, 1), new Pair(1, 6, 1),
|
||||
new Pair(2, 1, 2), new Pair(2, 2, 2),
|
||||
new Pair(2, 3, 2), new Pair(2, 4, 2),
|
||||
new Pair(2, 5, 2), new Pair(2, 6, 2),
|
||||
new Pair(undefined, 1, 1), new Pair(undefined, 2, 1),
|
||||
new Pair(undefined, 3, 1), new Pair(undefined, 4, 1),
|
||||
new Pair(undefined, 5, 1), new Pair(undefined, 6, 1)
|
||||
];
|
||||
|
||||
test('should sort mutliple properties in ascending order by default', 1, function() {
|
||||
var actual = _.sortByOrder(objects, ['a', 'b']);
|
||||
deepEqual(actual, _.at(objects, [2, 0, 3, 1]));
|
||||
});
|
||||
|
||||
test('should sort multiple properties depending on specified orders', 1, function() {
|
||||
var actual = _.sortByOrder(complexObjects, ['a', 'b'], [false, true]);
|
||||
deepEqual(actual, _.at(complexObjects, [3, 1, 2, 0]));
|
||||
});
|
||||
|
||||
test('should sort ascendingly for property not specified', 1, function() {
|
||||
var actual = _.sortByOrder(complexObjects, ['a', 'c'], [false]);
|
||||
deepEqual(actual, _.at(complexObjects, [3, 1, 0, 2]));
|
||||
});
|
||||
|
||||
test('should perform a stable sort (test in IE > 8, Opera, and V8)', 1, function() {
|
||||
var actual = _.sortByOrder(stableOrder, ['a', 'c']);
|
||||
deepEqual(actual, stableOrder);
|
||||
});
|
||||
|
||||
test('should not error on nullish elements', 1, function() {
|
||||
try {
|
||||
var actual = _.sortByOrder(objects.concat(undefined), ['a', 'b']);
|
||||
} catch(e) {}
|
||||
|
||||
deepEqual(actual, [objects[2], objects[0], objects[3], objects[1], undefined]);
|
||||
});
|
||||
}());
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
QUnit.module('sortedIndex methods');
|
||||
|
||||
_.each(['sortedIndex', 'sortedLastIndex'], function(methodName) {
|
||||
@@ -16119,6 +16186,7 @@
|
||||
'shuffle',
|
||||
'sortBy',
|
||||
'sortByAll',
|
||||
'sortByOrder',
|
||||
'take',
|
||||
'times',
|
||||
'toArray',
|
||||
@@ -16133,7 +16201,7 @@
|
||||
|
||||
var acceptFalsey = _.difference(allMethods, rejectFalsey);
|
||||
|
||||
test('should accept falsey arguments', 211, function() {
|
||||
test('should accept falsey arguments', 213, function() {
|
||||
var emptyArrays = _.map(falsey, _.constant([])),
|
||||
isExposed = '_' in root,
|
||||
oldDash = root._;
|
||||
@@ -16175,7 +16243,7 @@
|
||||
});
|
||||
});
|
||||
|
||||
test('should return an array', 70, function() {
|
||||
test('should return an array', 72, function() {
|
||||
var array = [1, 2, 3];
|
||||
|
||||
_.each(returnArrays, function(methodName) {
|
||||
|
||||
Reference in New Issue
Block a user