@shopmacher/validate - npm Package Compare versions

Comparing version 0.1.0 to 0.2.0

lib/validate.js

@@ -1,1 +0,1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.validate=t():e.validate=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(2),i=function(e){return e&&e.__esModule?e:{default:e}}(r);n(10);t.default=i.default,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(e,t){for(var n=0;t.length>n;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=n(3),a=function(e){return e&&e.__esModule?e:{default:e}}(o),u=n(5),s=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(u);t.default=function(){function e(t){var n=this;if(r(this,e),this.$ref=null,this.$errorRef=null,this.options={},this.activeValidators=[],this.createValidators=function(){var e=n.options,t=e.minLength,r=e.maxLength,i=e.empty,o=e.type;i.message&&n.activeValidators.push(s.empty(n.$ref,i)),t&&t.value&&n.activeValidators.push(s.minLength(n.$ref,t)),r&&r.value&&n.activeValidators.push(s.maxLength(n.$ref,r)),o&&o.value&&n.activeValidators.push(s.dataType(n.$ref,o))},this.validate=function(){var e=n.activeValidators.reduce(function(e,t){return t.isValid()?e:e.concat(t.message||n.options.errorMessage)},[]),t=0===e.length;return t?n.$ref.classList.remove("sm-validate-error"):n.$ref.classList.add("sm-validate-error"),n.$errorRef&&(n.$errorRef.innerHTML="<div>"+e.join("</div><div>")+"</div>"),t},!(this.$ref=t))throw Error("Validator needs an element reference, to be initialized.");var i=this.$ref.dataset,o=i.validateEmptyMessage,u=i.validateMinlength,f=i.validateMinlengthMessage,l=i.validateMaxlength,c=i.validateMaxlengthMessage,d=i.validateType,v=i.validateTypeMessage,p=i.validateDebounce,y=i.validateMessageCount,m=i.validateErrorMessage,h=i.validateErrorElement;this.options={empty:{message:o},minLength:{value:u,message:f},maxLength:{value:l,message:c},type:{value:d,message:v},trigger:{debounce:p?parseInt(p,10):300},errorMessage:m,messageCount:y},h&&(this.$errorRef=document.querySelector(h)),this.createValidators(),this.validateDebounced=(0,a.default)(this.validate,this.options.trigger.debounce),this.$ref.addEventListener("keyup",this.validateDebounced),this.$ref.addEventListener("blur",this.validate)}return i(e,null,[{key:"init",value:function(){var t=document.querySelectorAll('[data-validate="true"]');return Array.prototype.map.call(t,function(t){return new e(t)})}},{key:"attachToForm",value:function(e,t){e.addEventListener("submit",function(e){t.map(function(e){return e.validate()}).some(function(e){return!e})&&e.preventDefault()})}}]),e}(),e.exports=t.default},function(e,t,n){"use strict";(function(t){function n(e,t,n){function i(t){var n=y,r=m;return y=m=void 0,O=t,b=e.apply(r,n)}function o(e){return O=e,g=setTimeout(l,t),$?i(e):b}function u(e){var n=e-x,r=e-O,i=t-n;return w?j(i,h-r):i}function f(e){var n=e-x,r=e-O;return void 0===x||n>=t||0>n||w&&r>=h}function l(){var e=_();if(f(e))return c(e);g=setTimeout(l,u(e))}function c(e){return g=void 0,L&&y?i(e):(y=m=void 0,b)}function d(){void 0!==g&&clearTimeout(g),O=0,y=x=m=g=void 0}function v(){return void 0===g?b:c(_())}function p(){var e=_(),n=f(e);if(y=arguments,m=this,x=e,n){if(void 0===g)return o(x);if(w)return g=setTimeout(l,t),i(x)}return void 0===g&&(g=setTimeout(l,t)),b}var y,m,h,b,g,x,O=0,$=!1,w=!1,L=!0;if("function"!=typeof e)throw new TypeError(s);return t=a(t)||0,r(n)&&($=!!n.leading,w="maxWait"in n,h=w?M(a(n.maxWait)||0,t):h,L="trailing"in n?!!n.trailing:L),p.cancel=d,p.flush=v,p}function r(e){var t=void 0===e?"undefined":u(e);return!!e&&("object"==t||"function"==t)}function i(e){return!!e&&"object"==(void 0===e?"undefined":u(e))}function o(e){return"symbol"==(void 0===e?"undefined":u(e))||i(e)&&x.call(e)==l}function a(e){if("number"==typeof e)return e;if(o(e))return f;if(r(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=r(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(c,"");var n=v.test(e);return n||p.test(e)?y(e.slice(2),n?2:8):d.test(e)?f:+e}var u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s="Expected a function",f=NaN,l="[object Symbol]",c=/^\s+|\s+$/g,d=/^[-+]0x[0-9a-f]+$/i,v=/^0b[01]+$/i,p=/^0o[0-7]+$/i,y=parseInt,m="object"==(void 0===t?"undefined":u(t))&&t&&t.Object===Object&&t,h="object"==("undefined"==typeof self?"undefined":u(self))&&self&&self.Object===Object&&self,b=m||h||Function("return this")(),g=Object.prototype,x=g.toString,M=Math.max,j=Math.min,_=function(){return b.Date.now()};e.exports=n}).call(t,n(4))},function(e,t,n){"use strict";var r,i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};r=function(){return this}();try{r=r||Function("return this")()||(0,eval)("this")}catch(e){"object"===("undefined"==typeof window?"undefined":i(window))&&(r=window)}e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.dataType=t.empty=t.maxLength=t.minLength=void 0;var i=n(6),o=r(i),a=n(7),u=r(a),s=n(8),f=r(s),l=n(9),c=r(l);t.minLength=o.default,t.maxLength=u.default,t.empty=f.default,t.dataType=c.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.value,r=t.message;return{isValid:function(){return e.value.length>=n},message:r}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.value,r=t.message;return{isValid:function(){return n>e.value.length},message:r}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.message;return{isValid:function(){return e.value.length>0},message:n}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.value,r=t.message;return{isValid:function(){var t=e.value;switch(n){case"number":var r=parseInt(t,10);return"number"==typeof r&&!isNaN(r);case"text":return"string"==typeof t;default:return!1}},message:r}},e.exports=t.default},function(e,t){}])});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.validate=t():e.validate=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(2),i=function(e){return e&&e.__esModule?e:{default:e}}(r);n(11);t.default=i.default,e.exports=t.default},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(e,t){for(var n=0;t.length>n;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(3),o=function(e){return e&&e.__esModule?e:{default:e}}(a),u=n(5),s=function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}(u);t.default=function(){function e(t){var n=this;if(r(this,e),this.$ref=null,this.$errorRef=null,this.options={},this.activeValidators=[],this.createValidators=function(){var e=n.options,t=e.minLength,r=e.maxLength,i=e.empty,a=e.type,o=e.regex;i.message&&n.activeValidators.push(s.empty(n.$ref,i)),t&&t.value&&n.activeValidators.push(s.minLength(n.$ref,t)),r&&r.value&&n.activeValidators.push(s.maxLength(n.$ref,r)),a&&a.value&&n.activeValidators.push(s.dataType(n.$ref,a)),o&&o.value&&n.activeValidators.push(s.regex(n.$ref,o))},this.validate=function(){var e=n.activeValidators.reduce(function(e,t){return t.isValid()?e:e.concat(t.message||n.options.invalidMessage)},[]),t=0===e.length;return t?n.$ref.classList.remove("sm-validate-error"):n.$ref.classList.add("sm-validate-error"),n.$errorRef&&(n.$errorRef.innerHTML=e.join("<br/>")),t},!(this.$ref=t))throw Error("Validator needs an element reference, to be initialized.");var i=this.$ref.dataset,a=i.validateEmptyMessage,u=i.validateMinlength,l=i.validateMinlengthMessage,f=i.validateMaxlength,c=i.validateMaxlengthMessage,d=i.validateType,v=i.validateTypeMessage,p=i.validateRegex,m=i.validateRegexMessage,y=i.validateDebounce,g=i.validateMessageCount,b=i.validateInvalidMessage,h=i.validateErrorElement;this.options={empty:{message:a},minLength:{value:u,message:l},maxLength:{value:f,message:c},type:{value:d,message:v},regex:{value:p,message:m},trigger:{debounce:y?parseInt(y,10):300},invalidMessage:b,messageCount:g},h&&(this.$errorRef=document.querySelector(h)),this.createValidators(),this.validateDebounced=(0,o.default)(this.validate,this.options.trigger.debounce),this.$ref.addEventListener("keyup",this.validateDebounced),this.$ref.addEventListener("blur",this.validate)}return i(e,null,[{key:"init",value:function(){var t=document.querySelectorAll('[data-validate="true"]');return Array.prototype.map.call(t,function(t){return new e(t)})}},{key:"attachToForm",value:function(e,t){e.addEventListener("submit",function(e){t.map(function(e){return e.validate()}).some(function(e){return!e})&&e.preventDefault()})}}]),e}(),e.exports=t.default},function(e,t,n){"use strict";(function(t){function n(e,t,n){function i(t){var n=m,r=y;return m=y=void 0,O=t,b=e.apply(r,n)}function a(e){return O=e,h=setTimeout(f,t),$?i(e):b}function u(e){var n=e-x,r=e-O,i=t-n;return w?j(i,g-r):i}function l(e){var n=e-x,r=e-O;return void 0===x||n>=t||0>n||w&&r>=g}function f(){var e=_();if(l(e))return c(e);h=setTimeout(f,u(e))}function c(e){return h=void 0,L&&m?i(e):(m=y=void 0,b)}function d(){void 0!==h&&clearTimeout(h),O=0,m=x=y=h=void 0}function v(){return void 0===h?b:c(_())}function p(){var e=_(),n=l(e);if(m=arguments,y=this,x=e,n){if(void 0===h)return a(x);if(w)return h=setTimeout(f,t),i(x)}return void 0===h&&(h=setTimeout(f,t)),b}var m,y,g,b,h,x,O=0,$=!1,w=!1,L=!0;if("function"!=typeof e)throw new TypeError(s);return t=o(t)||0,r(n)&&($=!!n.leading,w="maxWait"in n,g=w?M(o(n.maxWait)||0,t):g,L="trailing"in n?!!n.trailing:L),p.cancel=d,p.flush=v,p}function r(e){var t=void 0===e?"undefined":u(e);return!!e&&("object"==t||"function"==t)}function i(e){return!!e&&"object"==(void 0===e?"undefined":u(e))}function a(e){return"symbol"==(void 0===e?"undefined":u(e))||i(e)&&x.call(e)==f}function o(e){if("number"==typeof e)return e;if(a(e))return l;if(r(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=r(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(c,"");var n=v.test(e);return n||p.test(e)?m(e.slice(2),n?2:8):d.test(e)?l:+e}var u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s="Expected a function",l=NaN,f="[object Symbol]",c=/^\s+|\s+$/g,d=/^[-+]0x[0-9a-f]+$/i,v=/^0b[01]+$/i,p=/^0o[0-7]+$/i,m=parseInt,y="object"==(void 0===t?"undefined":u(t))&&t&&t.Object===Object&&t,g="object"==("undefined"==typeof self?"undefined":u(self))&&self&&self.Object===Object&&self,b=y||g||Function("return this")(),h=Object.prototype,x=h.toString,M=Math.max,j=Math.min,_=function(){return b.Date.now()};e.exports=n}).call(t,n(4))},function(e,t,n){"use strict";var r,i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};r=function(){return this}();try{r=r||Function("return this")()||(0,eval)("this")}catch(e){"object"===("undefined"==typeof window?"undefined":i(window))&&(r=window)}e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.regex=t.dataType=t.empty=t.maxLength=t.minLength=void 0;var i=n(6),a=r(i),o=n(7),u=r(o),s=n(8),l=r(s),f=n(9),c=r(f),d=n(10),v=r(d);t.minLength=a.default,t.maxLength=u.default,t.empty=l.default,t.dataType=c.default,t.regex=v.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.value,r=t.message;return{isValid:function(){return e.value.length>=n},message:r}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.value,r=t.message;return{isValid:function(){return n>e.value.length},message:r}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.message;return{isValid:function(){return e.value.length>0},message:n}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.value,r=t.message;return{isValid:function(){var t=e.value;switch(n){case"number":var r=parseInt(t,10);return"number"==typeof r&&!isNaN(r);case"text":return"string"==typeof t;case"email":return/.+@.+\..{2,}/i.test(t);default:return!1}},message:r}},e.exports=t.default},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=t.value,r=t.message;return{isValid:function(){return RegExp(n).test(e.value)},message:r}},e.exports=t.default},function(e,t){}])});

package.json

 {
   "name": "@shopmacher/validate",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "JavaScript form validation library",
@@ -5,0 +5,0 @@ "main": "lib/validate.js",

src/core/Validator.js

@@ -27,5 +27,7 @@ import debounce from 'lodash.debounce';
             validateTypeMessage,
+            validateRegex,
+            validateRegexMessage,
             validateDebounce,
             validateMessageCount,
-            validateErrorMessage,
+            validateInvalidMessage,
             validateErrorElement
@@ -50,6 +52,10 @@ } = this.$ref.dataset;
             },
+            regex: {
+                value: validateRegex,
+                message: validateRegexMessage
+            },
             trigger: {
                 debounce: validateDebounce ? parseInt(validateDebounce, 10) : 300
             },
-            errorMessage: validateErrorMessage,
+            invalidMessage: validateInvalidMessage,
             messageCount: validateMessageCount
@@ -76,3 +82,4 @@ };
             empty,
-            type
+            type,
+            regex
         } = this.options;
@@ -95,2 +102,6 @@
         }
+
+        if (regex && regex.value) {
+            this.activeValidators.push(validators.regex(this.$ref, regex));
+        }
     };
@@ -101,3 +112,3 @@
             return !validator.isValid()
-                ? messages.concat(validator.message || this.options.errorMessage)
+                ? messages.concat(validator.message || this.options.invalidMessage)
                 : messages;
@@ -115,3 +126,3 @@ }, []);
         if (this.$errorRef) {
-            this.$errorRef.innerHTML = `<div>${messages.join('</div><div>')}</div>`;
+            this.$errorRef.innerHTML = messages.join('<br/>');
         }
@@ -118,0 +129,0 @@

src/validators/data-type.js

@@ -11,2 +11,4 @@ export default ($input, { value, message }) => ({
                 return typeof inputValue === 'string';
+            case 'email':
+                return /.+@.+\..{2,}/i.test(inputValue);
             default:
@@ -13,0 +15,0 @@ return false;

src/validators/index.js

@@ -5,1 +5,2 @@ export minLength from './min-length.js';
 export dataType from './data-type';
+export regex from './regex';

No alert changes

Improved metrics

Lines of code

290

increased by6.23%

Worsened metrics

Total package byte prevSize

25042

decreased by-5.22%

No dependency changes