Email regex fix

CHANGELOG

@@ -1,3 +1,13 @@
+0.5.2
+Complexity fixes
+Fixed email regex taking too long on certain entries
+Added
+- String
+  - regex
+
+0.5.1
+Added CircleCI
+
 0.5.0
 Added
 - Object

README.md

@@ -7,7 +7,6 @@
 [![size](https://img.shields.io/bundlephobia/min/nope-validator.svg)](https://bundlephobia.com/result?p=nope-validator)
 [![gzip](https://img.shields.io/bundlephobia/minzip/nope-validator.svg)](https://bundlephobia.com/result?p=nope-validator)
 
-
 A small, simple and fast JS validator. Like, wow thats fast. 🚀
 
 Nope is heavily inspired by [Yup](https://github.com/jquense/yup) but attempts to be smaller and faster. To achieve this Nope only allows for synchronous data validation which should cover most of the use cases.
@@ -71,6 +70,17 @@ UserSchema.validate({
 
 - `String`
 
+  - `regex(regex: RegExp, message: string)` - Asserts if the entry matches the pattern
+  - ```js
+    Nope.string()
+      .regex(/abc/i)
+      .validate('abc'); // returns undefined
+
+    Nope.string()
+      .regex(/abc/i)
+      .validate('123'); // returns the error message
+    ```
+
   - `url(message: string)` - Asserts if the entry is a valid URL
   - ```js
     Nope.string()
@@ -374,10 +384,9 @@ UserSchema.validate({
 
   - ```js
     const baseSchema = Nope.object().shape({
-      password: Nope.string()
-        .min(5),
+      password: Nope.string().min(5),
       confirmPassword: Nope.string()
-        .oneOf([Nope.ref('password')], 'Passwords don\'t match')
+        .oneOf([Nope.ref('password')], "Passwords don't match")
         .required(),
     });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nope-validator",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "MIT",

src/__tests__/NopeString.spec.ts

@@ -1,6 +1,32 @@
 import Nope from '..';
 
 describe('#NopeString', () => {
+  describe('#regex', () => {
+    it('should return undefined for an empty entry', () => {
+      expect(
+        Nope.string()
+          .regex(/abc/i, 'urlErrorMessage')
+          .validate(undefined),
+      ).toBe(undefined);
+    });
+
+    it('should return an error message for an invalid entry', () => {
+      expect(
+        Nope.string()
+          .regex(/abc/i, 'errorMessage')
+          .validate('http:google.com'),
+      ).toBe('errorMessage');
+    });
+
+    it('should return undefined for an valid entry', () => {
+      expect(
+        Nope.string()
+          .regex(/abc/i)
+          .validate('abc'),
+      ).toBe(undefined);
+    });
+  });
+
   describe('#url', () => {
     it('should return undefined for an empty entry', () => {
       expect(

src/consts.ts

@@ -1,3 +1,3 @@
-export const emailRegex = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i;
+export const emailRegex = /^(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])$/gi;
 
 export const urlRegex = /^((https?|ftp):)?\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i;