mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-01-31 07:17:50 +00:00
Ensure _.omit works with symbols.
This commit is contained in:
25
lodash.js
25
lodash.js
@@ -2303,7 +2303,7 @@
|
||||
*
|
||||
* @private
|
||||
* @param {*} value The value to inspect.
|
||||
* @returns {Array} Returns the array-like object.
|
||||
* @returns {Array|Object} Returns the cast array-like object.
|
||||
*/
|
||||
function baseCastArrayLikeObject(value) {
|
||||
return isArrayLikeObject(value) ? value : [];
|
||||
@@ -2314,12 +2314,23 @@
|
||||
*
|
||||
* @private
|
||||
* @param {*} value The value to inspect.
|
||||
* @returns {Array} Returns the array-like object.
|
||||
* @returns {Function} Returns cast function.
|
||||
*/
|
||||
function baseCastFunction(value) {
|
||||
return typeof value == 'function' ? value : identity;
|
||||
}
|
||||
|
||||
/**
|
||||
* Casts `value` to a string if it's not a string or symbol.
|
||||
*
|
||||
* @private
|
||||
* @param {*} value The value to inspect.
|
||||
* @returns {string|symbol} Returns the cast key.
|
||||
*/
|
||||
function baseCastKey(key) {
|
||||
return (typeof key == 'string' || isSymbol(key)) ? key : (key + '');
|
||||
}
|
||||
|
||||
/**
|
||||
* Casts `value` to a path array if it's not one.
|
||||
*
|
||||
@@ -12042,8 +12053,12 @@
|
||||
if (object == null) {
|
||||
return {};
|
||||
}
|
||||
props = arrayMap(baseFlatten(props, 1), String);
|
||||
return basePick(object, baseDifference(keysIn(object), props));
|
||||
var allProps = keysIn(object);
|
||||
if (!isArray(object)) {
|
||||
arrayPush(allProps, getSymbolsIn(object));
|
||||
}
|
||||
props = arrayMap(baseFlatten(props, 1), baseCastKey);
|
||||
return basePick(object, baseDifference(allProps, props));
|
||||
});
|
||||
|
||||
/**
|
||||
@@ -14494,7 +14509,7 @@
|
||||
* // => false
|
||||
*/
|
||||
function toPath(value) {
|
||||
return isArray(value) ? arrayMap(value, String) : stringToPath(value);
|
||||
return isArray(value) ? arrayMap(value, baseCastKey) : stringToPath(value);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
69
test/test.js
69
test/test.js
@@ -15512,24 +15512,26 @@
|
||||
var expected = { 'b': 2, 'd': 4 },
|
||||
func = _[methodName],
|
||||
object = { 'a': 1, 'b': 2, 'c': 3, 'd': 4 },
|
||||
prop = function(object, props) { return props; };
|
||||
prop = lodashStable.nthArg(1);
|
||||
|
||||
if (methodName == 'omitBy') {
|
||||
prop = function(object, props) {
|
||||
props = typeof props == 'string' ? [props] : props;
|
||||
props = lodashStable.isArray(props) ? props : [props];
|
||||
return function(value) {
|
||||
return _.some(props, function(key) { return object[key] === value; });
|
||||
return lodashStable.some(props, function(key) {
|
||||
return object[key] === value;
|
||||
});
|
||||
};
|
||||
};
|
||||
}
|
||||
QUnit.test('`_.' + methodName + '` should create an object with omitted properties', function(assert) {
|
||||
QUnit.test('`_.' + methodName + '` should create an object with omitted string keyed properties', function(assert) {
|
||||
assert.expect(2);
|
||||
|
||||
assert.deepEqual(func(object, prop(object, 'a')), { 'b': 2, 'c': 3, 'd': 4 });
|
||||
assert.deepEqual(func(object, prop(object, ['a', 'c'])), expected);
|
||||
});
|
||||
|
||||
QUnit.test('`_.' + methodName + '` should iterate over inherited string keyed properties', function(assert) {
|
||||
QUnit.test('`_.' + methodName + '` should include inherited string keyed properties', function(assert) {
|
||||
assert.expect(1);
|
||||
|
||||
function Foo() {}
|
||||
@@ -15538,6 +15540,59 @@
|
||||
assert.deepEqual(func(new Foo, prop(object, ['a', 'c'])), expected);
|
||||
});
|
||||
|
||||
QUnit.test('`_.' + methodName + '` should include symbol properties', function(assert) {
|
||||
assert.expect(2);
|
||||
|
||||
function Foo() {
|
||||
this.a = 0;
|
||||
this[symbol] = 1;
|
||||
}
|
||||
|
||||
if (Symbol) {
|
||||
var symbol2 = Symbol('b');
|
||||
Foo.prototype[symbol2] = 2;
|
||||
|
||||
var foo = new Foo,
|
||||
actual = func(foo, prop(foo, 'a'));
|
||||
|
||||
assert.strictEqual(actual[symbol], 1);
|
||||
assert.strictEqual(actual[symbol2], 2);
|
||||
}
|
||||
else {
|
||||
skipAssert(assert, 2);
|
||||
}
|
||||
});
|
||||
|
||||
QUnit.test('`_.' + methodName + '` should create an object with omitted symbol properties', function(assert) {
|
||||
assert.expect(6);
|
||||
|
||||
function Foo() {
|
||||
this.a = 0;
|
||||
this[symbol] = 1;
|
||||
}
|
||||
|
||||
if (Symbol) {
|
||||
var symbol2 = Symbol('b');
|
||||
Foo.prototype[symbol2] = 2;
|
||||
|
||||
var foo = new Foo,
|
||||
actual = func(foo, prop(foo, symbol));
|
||||
|
||||
assert.strictEqual(actual.a, 0);
|
||||
assert.strictEqual(actual[symbol], undefined);
|
||||
assert.strictEqual(actual[symbol2], 2);
|
||||
|
||||
actual = func(foo, prop(foo, symbol2));
|
||||
|
||||
assert.strictEqual(actual.a, 0);
|
||||
assert.strictEqual(actual[symbol], 1);
|
||||
assert.strictEqual(actual[symbol2], undefined);
|
||||
}
|
||||
else {
|
||||
skipAssert(assert, 6);
|
||||
}
|
||||
});
|
||||
|
||||
QUnit.test('`_.' + methodName + '` should work with an array `object` argument', function(assert) {
|
||||
assert.expect(1);
|
||||
|
||||
@@ -16574,14 +16629,14 @@
|
||||
};
|
||||
};
|
||||
}
|
||||
QUnit.test('`_.' + methodName + '` should create an object of picked properties', function(assert) {
|
||||
QUnit.test('`_.' + methodName + '` should create an object of picked string keyed properties', function(assert) {
|
||||
assert.expect(2);
|
||||
|
||||
assert.deepEqual(func(object, prop(object, 'a')), { 'a': 1 });
|
||||
assert.deepEqual(func(object, prop(object, ['a', 'c'])), expected);
|
||||
});
|
||||
|
||||
QUnit.test('`_.' + methodName + '` should pick inherited properties', function(assert) {
|
||||
QUnit.test('`_.' + methodName + '` should pick inherited string keyed properties', function(assert) {
|
||||
assert.expect(1);
|
||||
|
||||
function Foo() {}
|
||||
|
||||
Reference in New Issue
Block a user