Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-11 03:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify _.escapeRegExp to align with the defunct ES7 proposal.

Browse Source
This commit is contained in:
John-David Dalton
2015-07-31 14:02:59 -07:00
parent 73464d6bb6
commit 61251b305d
2 changed files with 11 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lodash.js
View File

@@ -94,10 +94,9 @@
rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g; rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g;
/** /**
* Used to match `RegExp` [syntax characters](http://ecma-international.org/ecma-262/6.0/#sec-patterns) * Used to match `RegExp` [syntax characters](http://ecma-international.org/ecma-262/6.0/#sec-patterns).
* and those outlined by [`EscapeRegExpPattern`](http://ecma-international.org/ecma-262/6.0/#sec-escaperegexppattern).
*/ */
var reRegExpChars = /^[:!,]|[\\^$.*+?()[\]{}|\/]|(^[0-9a-fA-Fnrtuvx])|([\n\r\u2028\u2029])/g, var reRegExpChars = /[\\^$.*+?()[\]{}|]/g,
reHasRegExpChars = RegExp(reRegExpChars.source); reHasRegExpChars = RegExp(reRegExpChars.source);
/** Used to match [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks). */ /** Used to match [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks). */
@@ -9805,8 +9804,8 @@
} }
/** /**
* Escapes the `RegExp` special characters "\", "/", "^", "$", ".", "|", "?", * Escapes the `RegExp` special characters "^", "$", "\", ".", "*", "+",
* "*", "+", "(", ")", "[", "]", "{" and "}" in `string`. * "?", "(", ")", "[", "]", "{", "}", and "|" in `string`.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -9816,13 +9815,13 @@
* @example * @example
* *
* _.escapeRegExp('[lodash](https://lodash.com/)'); * _.escapeRegExp('[lodash](https://lodash.com/)');
* // => '\[lodash\]\(https:\/\/lodash\.com\/\)' * // => '\[lodash\]\(https://lodash\.com/\)'
*/ */
function escapeRegExp(string) { function escapeRegExp(string) {
string = baseToString(string); string = baseToString(string);
return (string && reHasRegExpChars.test(string)) return (string && reHasRegExpChars.test(string))
? string.replace(reRegExpChars, escapeRegExpChar) ? string.replace(reRegExpChars, '\\$&')
: (string || '(?:)'); : string;
} }
/** /**

38
test/test.js
View File

@@ -287,15 +287,6 @@
new URIError new URIError
]; ];
/** Used to check escaped regexp characters. */
var regexpEscapes = {
'0': 'x30', '1': 'x31', '2': 'x32', '3': 'x33', '4': 'x34',
'5': 'x35', '6': 'x36', '7': 'x37', '8': 'x38', '9': 'x39',
'A': 'x41', 'B': 'x42', 'C': 'x43', 'D': 'x44', 'E': 'x45', 'F': 'x46',
'a': 'x61', 'b': 'x62', 'c': 'x63', 'd': 'x64', 'e': 'x65', 'f': 'x66',
'n': 'x6e', 'r': 'x72', 't': 'x74', 'u': 'x75', 'v': 'x76', 'x': 'x78'
};
/** Used to check whether methods support typed arrays. */ /** Used to check whether methods support typed arrays. */
var typedArrays = [ var typedArrays = [
'Float32Array', 'Float32Array',
@@ -3609,41 +3600,20 @@
QUnit.module('lodash.escapeRegExp'); QUnit.module('lodash.escapeRegExp');
(function() { (function() {
var escaped = '\\/\\^\\$\\.\\*\\+\\?\\(\\)\\[\\]\\{\\}\\|\\n\\r\\u2028\\u2029\\\\', var escaped = '\\^\\$\\.\\*\\+\\?\\(\\)\\[\\]\\{\\}\\|\\\\',
unescaped = '/^$.*+?()[]{}|\n\r\u2028\u2029\\'; unescaped = '^$.*+?()[]{}|\\';
test('should escape values', 1, function() { test('should escape values', 1, function() {
strictEqual(_.escapeRegExp(unescaped + unescaped), escaped + escaped); strictEqual(_.escapeRegExp(unescaped + unescaped), escaped + escaped);
}); });
test('should escape special characters at the start of a string', 1, function() {
var chars = [
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'a', 'b', 'c', 'd', 'e', 'f',
'A', 'B', 'C', 'D', 'E', 'F',
'n', 'r', 't', 'u', 'v', 'x',
':', '!', ','
];
var expected = _.map(chars, function(chr) {
var escaped = '\\' + (regexpEscapes[chr] || chr);
return [escaped, escaped + 'z', 'z' + chr];
});
var actual = _.map(chars, function(chr) {
return [_.escapeRegExp(chr), _.escapeRegExp(chr + 'z'), _.escapeRegExp('z' + chr)];
});
deepEqual(actual, expected);
});
test('should handle strings with nothing to escape', 1, function() { test('should handle strings with nothing to escape', 1, function() {
strictEqual(_.escapeRegExp('ghi'), 'ghi'); strictEqual(_.escapeRegExp('ghi'), 'ghi');
}); });
test('should return `"(?:)"` when provided nullish or empty string values', 1, function() { test('should return an empty string for empty values', 1, function() {
var values = [, null, undefined, ''], var values = [, null, undefined, ''],
expected = _.map(values, _.constant('(?:)')); expected = _.map(values, _.constant(''));
var actual = _.map(values, function(value, index) { var actual = _.map(values, function(value, index) {
return index ? _.escapeRegExp(value) : _.escapeRegExp(); return index ? _.escapeRegExp(value) : _.escapeRegExp();