Merge pull request #232 from imbrn/fix-inefficient-case-regex

fix inefficient regular expressions on lowercase and uppercase rules
imbrn · Jul 1, 2022 · 241d302 · 241d302
2 parents 472b06b + 9970ffc
commit 241d302
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Inefficient regular expression complexity of lowercase() and uppercase() rules
+
 ## [1.5.0] - 2022-06-27
 
 ### Added

diff --git a/src/v8n.js b/src/v8n.js
@@ -189,9 +189,15 @@ const availableRules = {
 
   pattern: expected => value => expected.test(value),
 
-  lowercase: () => value => /^([a-z]+\s*)+$/.test(value),
+  lowercase: () => value => {
+    return (
+      typeof value === 'boolean' ||
+      (value === value.toLowerCase() && value.trim() !== '')
+    );
+  },
 
-  uppercase: () => value => /^([A-Z]+\s*)+$/.test(value),
+  uppercase: () => value =>
+    value === value.toUpperCase() && value.trim() !== '',
 
   vowel: () => value => /^[aeiou]+$/i.test(value),