check-rule-mate 0.2.1 → 0.4.0

package/dist/main.cjs.js

@@ -1 +1 @@
-var g=Object.defineProperty;var O=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var q=Object.prototype.hasOwnProperty;var E=(n,s)=>{for(var u in s)g(n,u,{get:s[u],enumerable:!0})},v=(n,s,u,a)=>{if(s&&typeof s=="object"||typeof s=="function")for(let f of b(s))!q.call(n,f)&&f!==u&&g(n,f,{get:()=>s[f],enumerable:!(a=O(s,f))||a.enumerable});return n};var R=n=>v(g({},"__esModule",{value:!0}),n);var I={};E(I,{dataValidate:()=>m});module.exports=R(I);function m(n,{validationHelpers:s={},rules:u,dataRule:a,dataErrorMessages:f={}}){let p={};function y(r,l){if(!r||typeof l!="string")return;let t=l.split("."),o=r;for(let d of t){if(o[d]===void 0)return;o=o[d]}return o}function i(r,l=null){let{rule:t,required:o}=a[r.key];if((t&&o||!o&&r.value!="")&&t){let d=t.split("--")[0],e=t.split("--").length>1?t.split("--")[1]:"",V=j(r.value,u[d],e,s,l),{isValid:h,errorMessage:k,errorType:M}=V.validate();return h||(p[r.key]={name:r.key,error:!0,errorMessage:y(f,k)||k,errorType:M}),h}return!0}function c(){let r=Object.keys(n).map(l=>({key:l,value:n[l]}));if(r&&r.length>0){if(!Object.keys(a).every(e=>n.hasOwnProperty(e)))return{error:!0,errorMessage:"Missing properties"};if([...r].map(e=>i(e,n)).some(e=>!e))return{error:!0,dataErrors:p};let t=Object.keys(a).map(e=>({key:e,required:a[e].required})),o=r.map(e=>e.key);if(!t.filter(e=>e.required).map(e=>e.key).every(e=>o.includes(e)))return{error:!0}}else if(!r||r.length===0)return{error:!0,errorMessage:"Missing fields for dataRules"};return{ok:!0}}return c()}function j(n,s,u=null,a=null,f=null){function p(i){let c,r;return{isValid:!i.validate.some(t=>{let o=!0;if(i.params&&i.params[t]&&i.params[t].length>0){let d=i.params[t].map(e=>typeof e=="string"&&e[0]==="$"?e.substring(1,e.length):e);o=!this[t](...d)}else o=!this[t]();return o&&!c&&(i!=null&&i.error[t])&&(c=i.error[t],r=t),o}),errorMessage:c,errorType:r}}function y(){if(a&&typeof a=="function"){let i=a(n,s,u,f);Object.keys(i).forEach(c=>{this[c]=i[c]})}return u?p.call(this,s.modifier[u]):p.call(this,s)}return{validate:y}}0&&(module.exports={dataValidate});
+var h=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var M=Object.prototype.hasOwnProperty;var O=(n,s)=>{for(var o in s)h(n,o,{get:s[o],enumerable:!0})},b=(n,s,o,i)=>{if(s&&typeof s=="object"||typeof s=="function")for(let u of R(s))!M.call(n,u)&&u!==o&&h(n,u,{get:()=>s[u],enumerable:!(i=w(s,u))||i.enumerable});return n};var q=n=>b(h({},"__esModule",{value:!0}),n);var P={};O(P,{dataValidate:()=>V});module.exports=q(P);function V(n,{validationHelpers:s={},rules:o,dataRule:i,dataErrorMessages:u={}}){let y={};function g(e,f){if(!e||typeof f!="string")return;let l=f.split("."),t=e;for(let c of l){if(t[c]===void 0)return;t=t[c]}return t}async function a(e,f=null){let{rule:l,required:t}=i[e.key];if((l&&t||!t&&e.value!="")&&l){let c=l.split("--")[0],r=l.split("--").length>1?l.split("--")[1]:"",m=E(e.value,o[c],r,s,f),{isValid:p,errorMessage:v,errorType:k}=await m.validate();return p||(y[e.key]={name:e.key,error:!0,errorMessage:g(u,v)||v,errorType:k}),p}return!0}async function d(){let e=Object.keys(n).map(f=>({key:f,value:n[f]}));if(e&&e.length>0){if(!Object.keys(i).every(r=>n.hasOwnProperty(r)))return{error:!0,errorMessage:"Missing properties"};if((await Promise.all([...e].map(async r=>await a(r,n)))).some(r=>!r))return{error:!0,dataErrors:y};let l=Object.keys(i).map(r=>({key:r,required:i[r].required})),t=e.map(r=>r.key);if(!l.filter(r=>r.required).map(r=>r.key).every(r=>t.includes(r)))return{error:!0}}else if(!e||e.length===0)return{error:!0,errorMessage:"Missing fields for dataRules"};return{ok:!0}}return d()}function E(n,s,o=null,i=null,u=null){async function y(a){let d,e;return{isValid:!(await Promise.all(a.validate.map(async t=>{let c=!0;if(a.params&&a.params[t]&&a.params[t].length>0){let r=a.params[t].map(p=>typeof p=="string"&&p[0]==="$"?p.substring(1,p.length):p);c=await this[t](...r)}else c=await this[t]();return!c&&!d&&(a!=null&&a.error[t])&&(d=a.error[t],e=t),c}))).some(t=>!t),errorMessage:d,errorType:e}}async function g(){if(i&&typeof i=="function"){let d=i(n,s,o,u);Object.keys(d).forEach(e=>{this[e]=d[e]})}return o?await y.call(this,s.modifier[o]):await y.call(this,s)}return{validate:g}}0&&(module.exports={dataValidate});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "check-rule-mate",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "",
   "main": "./dist/main.cjs.js",
   "type": "commonjs",

package/src/js/dataValidate.js

@@ -21,7 +21,7 @@ export function dataValidate(data, {validationHelpers = {}, rules, dataRule, dat
         return current;
     }
 
-    function inputValidation(dataAttribute, data = null) {
+    async function inputValidation(dataAttribute, data = null) {
         const { rule, required } = dataRule[dataAttribute.key];
 
         if ((rule && required) || (!required && dataAttribute.value != '')) {
@@ -29,7 +29,7 @@ export function dataValidate(data, {validationHelpers = {}, rules, dataRule, dat
                 const INPUT_RULE = rule.split('--')[0];
                 const RULE_MODIFIER = rule.split('--').length > 1 ? rule.split('--')[1] : '';
                 const dataAttributeValidation = dataAttributeValidator(dataAttribute.value, rules[INPUT_RULE], RULE_MODIFIER, validationHelpers, data);
-                const { isValid, errorMessage, errorType } = dataAttributeValidation.validate();
+                const { isValid, errorMessage, errorType } = await dataAttributeValidation.validate();
                 if (!isValid) {
                     dataErrors[dataAttribute.key] = {
                         name: dataAttribute.key,
@@ -44,13 +44,13 @@ export function dataValidate(data, {validationHelpers = {}, rules, dataRule, dat
         return true;
     }
 
-    function validate() {
+    async function validate() {
         let dataArr = Object.keys(data).map((key) => ({ key, value: data[key] }));
         if (dataArr && dataArr.length > 0) {
             if(!Object.keys(dataRule).every((key) => data.hasOwnProperty(key))) {
                 return { error: true, errorMessage: "Missing properties"}
             }
-            const dataValidators = [...dataArr].map((input) => inputValidation(input, data));
+            const dataValidators = await Promise.all([...dataArr].map(async (input) => await inputValidation(input, data)));
 
             if (dataValidators.some((element) => !element)) {
                 return { error: true, dataErrors: dataErrors };
@@ -82,35 +82,38 @@ export function dataValidate(data, {validationHelpers = {}, rules, dataRule, dat
  * @returns {{validate: Function}} the built function to validate all this parameters
  */
 function dataAttributeValidator (value, rule, modifier = null, customValidation = null, data = null) {
-    function validateRules(rule) {
+    async function validateRules(rule) {
         let errorMessage;
         let errorType;
-        const isValid = !rule.validate.some((validation) => {
-            let isInvalid = true;
+        const validations = await Promise.all(rule.validate.map(async (validation) => {
+            let isValid = true;
             if ((rule.params && rule.params[validation] && rule.params[validation].length > 0)) {
                 const params = rule.params[validation].map((param) => (typeof param === 'string' && param[0] === '$') ? param.substring(1, param.length) : param);
-                isInvalid = !this[validation](...params)
+                const validateResponse = await this[validation](...params);
+                isValid = validateResponse;
             } else {
-                isInvalid = !this[validation]()
+                const validateResponse = await this[validation]();
+                isValid = validateResponse;
             }
-            if (isInvalid && !errorMessage && rule?.error[validation]) {
+            if (!isValid && !errorMessage && rule?.error[validation]) {
                 errorMessage = rule.error[validation];
                 errorType = validation;
             }
-            return isInvalid;
-        });
+            return isValid;
+        }));
+        const isValid = !validations.some((validation) => !validation);
         return {isValid, errorMessage, errorType}
     }
 
-    function validate() {
+    async function validate() {
         if (customValidation && typeof customValidation === 'function') {
             const validation = customValidation(value, rule, modifier, data);
             Object.keys(validation).forEach((key) => {
                 this[key] = validation[key];
             })
         }
-
-        return modifier ? validateRules.call(this, rule.modifier[modifier]) : validateRules.call(this, rule);
+        const response = modifier ? await validateRules.call(this, rule.modifier[modifier]) : await validateRules.call(this, rule);
+        return response;
     }
 
     return({