co.validation 2.2.1 → 2.3.2

package/lib/__tests__/component.valueValidation.js

@@ -292,6 +292,23 @@ describe('createValidation', () => {
       errors: undefined
     });
   });
+  it('supports maxLength with emoji', () => {
+    expect((0, _.createValidation)({
+      type: 'maxLength',
+      max: 4,
+      getMessage: max => max
+    })('❤️123')).toEqual({
+      data: '❤️123',
+      errors: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'maxLength',
+      max: 3
+    })('❤️123')).toEqual({
+      data: undefined,
+      errors: ['Must be 3 characters or less']
+    });
+  });
   it('supports minLength', () => {
     expect((0, _.createValidation)({
       type: 'minLength',
@@ -325,6 +342,30 @@ describe('createValidation', () => {
       errors: ['Must be at least 3 characters']
     });
   });
+  it('supports minLength with emoji', () => {
+    expect((0, _.createValidation)({
+      type: 'minLength',
+      min: 3,
+      getMessage: min => min
+    })('❤️')).toEqual({
+      data: undefined,
+      errors: ['3']
+    });
+    expect((0, _.createValidation)({
+      type: 'minLength',
+      min: 3
+    })('❤️1')).toEqual({
+      data: undefined,
+      errors: ['Must be at least 3 characters']
+    });
+    expect((0, _.createValidation)({
+      type: 'minLength',
+      min: 3
+    })('❤️123')).toEqual({
+      data: '❤️123',
+      errors: undefined
+    });
+  });
   it('supports number', () => {
     expect((0, _.createValidation)({
       type: 'number',
@@ -521,6 +562,12 @@ describe('createValidation', () => {
       data: undefined,
       errors: ['Invalid email format']
     });
+    expect((0, _.createValidation)({
+      type: 'email'
+    })('email.@mail.com')).toEqual({
+      data: undefined,
+      errors: ['Invalid email format']
+    });
   });
   it('supports alphanumeric', () => {
     expect((0, _.createValidation)({

package/lib/validators.js

@@ -47,11 +47,16 @@ const equals = ({
 
 exports.equals = equals;
 
+function getStringLength(str) {
+  const splitGraphemes = str.split(/[\ufe00-\ufe0f]/).join('').match(/./gu);
+  return splitGraphemes ? splitGraphemes.length : 0;
+}
+
 const maxLength = ({
   max,
   getMessage
 }) => value => {
-  return value && value.length > max ? {
+  return value && getStringLength(value) > max ? {
     errors: (0, _messageProcessor.default)(getMessage, `##maxLength`, string => string.replace(/{max}/g, max), max)
   } : {
     data: value
@@ -63,7 +68,7 @@ exports.maxLength = maxLength;
 const minLength = ({
   min,
   getMessage
-}) => value => value && value.length < min ? {
+}) => value => value && getStringLength(value) < min ? {
   errors: (0, _messageProcessor.default)(getMessage, `##minLength`, string => string.replace(/{min}/g, min), min)
 } : {
   data: value
@@ -102,10 +107,11 @@ const maxValue = ({
 };
 
 exports.maxValue = maxValue;
+const emailRegex = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
 
 const email = ({
   getMessage
-}) => value => value && !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(value) ? {
+}) => value => value && !emailRegex.test(value) ? {
   errors: (0, _messageProcessor.default)(getMessage, '##email')
 } : {
   data: value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "co.validation",
-  "version": "2.2.1",
+  "version": "2.3.2",
   "description": "JSON based fluent validation for browser, node.js, redux-form and anything javascript compatible.",
   "main": "lib/index.js",
   "scripts": {