Skip to content

Commit 1ba03ed

Browse files
Shreyas Minochamihai-vlc
Shreyas Minocha
authored andcommitted
Improve type checking in sanitize (#189)
Resolves #160
1 parent e399e1f commit 1ba03ed

6 files changed

+20
-6
lines changed

VerbalExpressions.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,18 @@ class VerbalExpression extends RegExp {
4040
* @memberof VerbalExpression
4141
*/
4242
static sanitize(value) {
43-
if (value.source) {
43+
if (value instanceof RegExp) {
4444
return value.source;
4545
}
4646

4747
if (typeof value === 'number') {
4848
return value;
4949
}
5050

51+
if (typeof value !== 'string') {
52+
return '';
53+
}
54+
5155
// Regular expression to match meta characters
5256
// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/regexp
5357
const toEscape = /([\].|*?+(){}^$\\:=[])/g;

dist/verbalexpressions.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,14 +632,18 @@ var VerbalExpression = function (_extendableBuiltin2) {
632632
}], [{
633633
key: 'sanitize',
634634
value: function sanitize(value) {
635-
if (value.source) {
635+
if (value instanceof RegExp) {
636636
return value.source;
637637
}
638638

639639
if (typeof value === 'number') {
640640
return value;
641641
}
642642

643+
if (typeof value !== 'string') {
644+
return '';
645+
}
646+
643647
// Regular expression to match meta characters
644648
// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/regexp
645649
var toEscape = /([\].|*?+(){}^$\\:=[])/g;

dist/verbalexpressions.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/verbalexpressions.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)