@cocreate/validation 1.8.11 → 1.8.13

package/src/index.js

@@ -1,82 +1,82 @@
-/********************************************************************************
- * Copyright (C) 2020 CoCreate LLC.
- *
- *
- * SPDX-License-Identifier: MIT
- ********************************************************************************/
-
-/*globals CustomEvent*/
-import action from '@cocreate/actions';
-// import render from '@cocreate/render';
-import {matches} from './validations/matches';
-import {required} from './validations/required';
-import {unique} from './validations/unique';
-import {subdomain} from './validations/subdomain';
-
-const validations = new Map();
-validations.set('matches', matches);
-validations.set('required', required);
-validations.set('subdomain', subdomain);
-validations.set('unique', unique);
-
-const selectors = '[matches], [required], [unique], [subdomain]';
-
-function validate(btn, params) {
-	let validateElements;
-	let validateSelectors = [];
-	let failedElements = [];
-	
-	if (params){
-		let selector = params
-		for (let [validation] of validations){
-			let vSelctor = `${selector}[${validation}]`;
-			validateSelectors.push(vSelctor);
-		}
-		let validSelectors = validateSelectors.join(', ');
-		validateElements = document.querySelectorAll(validSelectors);
-		if (!validateElements.length){
-			let element = document.querySelector(selector);
-			if (element)
-				validateElements = element.querySelectorAll(selectors);
-		}
-	} else {
-		let element = btn.closest('form');
-		validateElements = element.querySelectorAll(selectors);
-	}
-	
-	
-	for (let [validation, func] of validations){
-		let elements = [];
-		for (let element of validateElements){
-			// let validationSelectors = element.getAttribute('validate').replace(/ /g, '').split(',');
-			if (element.hasAttribute(validation)){
-				elements.push(element);	
-			}
-		}
-		if (elements.length){
-			let failedEls = func(elements);
-			if (failedEls)
-				failedElements.push(failedEls);
-		}
-	}
-	for (let element of validateElements){
-		let isValid = element.getAttribute('validation');
-		if (isValid == 'false')
-			failedElements.push(element);
-	}
-	
-	if (failedElements.length == 0){
-		document.dispatchEvent(new CustomEvent('validate', {
-			detail: {}
-		}));
-	} 
-}
-
-action.init({
-	name: "validate",
-	callback: (btn, params) => {
-		validate(btn, params);
-	}
-});
-
+/********************************************************************************
+ * Copyright (C) 2020 CoCreate LLC.
+ *
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+
+/*globals CustomEvent*/
+import action from '@cocreate/actions';
+// import render from '@cocreate/render';
+import {matches} from './validations/matches';
+import {required} from './validations/required';
+import {unique} from './validations/unique';
+import {subdomain} from './validations/subdomain';
+
+const validations = new Map();
+validations.set('matches', matches);
+validations.set('required', required);
+validations.set('subdomain', subdomain);
+validations.set('unique', unique);
+
+const selectors = '[matches], [required], [unique], [subdomain]';
+
+function validate(btn, params) {
+	let validateElements;
+	let validateSelectors = [];
+	let failedElements = [];
+	
+	if (params){
+		let selector = params
+		for (let [validation] of validations){
+			let vSelctor = `${selector}[${validation}]`;
+			validateSelectors.push(vSelctor);
+		}
+		let validSelectors = validateSelectors.join(', ');
+		validateElements = document.querySelectorAll(validSelectors);
+		if (!validateElements.length){
+			let element = document.querySelector(selector);
+			if (element)
+				validateElements = element.querySelectorAll(selectors);
+		}
+	} else {
+		let element = btn.closest('form');
+		validateElements = element.querySelectorAll(selectors);
+	}
+	
+	
+	for (let [validation, func] of validations){
+		let elements = [];
+		for (let element of validateElements){
+			// let validationSelectors = element.getAttribute('validate').replace(/ /g, '').split(',');
+			if (element.hasAttribute(validation)){
+				elements.push(element);	
+			}
+		}
+		if (elements.length){
+			let failedEls = func(elements);
+			if (failedEls)
+				failedElements.push(failedEls);
+		}
+	}
+	for (let element of validateElements){
+		let isValid = element.getAttribute('validation');
+		if (isValid == 'false')
+			failedElements.push(element);
+	}
+	
+	if (failedElements.length == 0){
+		document.dispatchEvent(new CustomEvent('validate', {
+			detail: {}
+		}));
+	} 
+}
+
+action.init({
+	name: "validate",
+	callback: (btn, params) => {
+		validate(btn, params);
+	}
+});
+
 export default {validations};

package/src/validations/matches.js

@@ -1,55 +1,55 @@
-import render from '@cocreate/render';
-
-function initMatches(){
-    let elements = document.querySelectorAll('[matches]');
-    for (let element of elements){
-        let targetSelector = element.getAttribute('matches');
-        let target = document.querySelector(targetSelector);
-        element.validations = {matches: target};
-        element.addEventListener('input', validateMatchEvent);
-    }
-}
-
-function validateMatchEvent(e){
-    validateMatch(e.target);
-}
-
-function validateMatch(element){
-    // let element = e.target;
-    let target = element.validations.matches;
-    if (target.value == element.value){
-        target.setAttribute('validation', 'true');
-        element.setAttribute('validation', 'true');
-    }
-    else {
-        target.setAttribute('validation', 'false');
-        element.setAttribute('validation', 'false');
-    }
-}
-
-function matches(elements){
-    let failedElements = [];
-    for (let element of elements) {
-        let isValid = element.getAttribute('validation');
-        if (isValid == 'false'){
-            failedElements.push(element);
-        }
-    }
-    if (failedElements.length){
-		render.data({
-			selector: "[template='validate']",
-			data: {
-		        type: 'matches',
-		        status: 'failed',
-		        message: 'One or more values do not match',
-		        selector: '[matches][validation="false"]',
-		        elements: failedElements
-	    	}
-		});
-		return failedElements;
-    }
-}
-
-initMatches();
-
+import render from '@cocreate/render';
+
+function initMatches(){
+    let elements = document.querySelectorAll('[matches]');
+    for (let element of elements){
+        let targetSelector = element.getAttribute('matches');
+        let target = document.querySelector(targetSelector);
+        element.validations = {matches: target};
+        element.addEventListener('input', validateMatchEvent);
+    }
+}
+
+function validateMatchEvent(e){
+    validateMatch(e.target);
+}
+
+function validateMatch(element){
+    // let element = e.target;
+    let target = element.validations.matches;
+    if (target.value == element.value){
+        target.setAttribute('validation', 'true');
+        element.setAttribute('validation', 'true');
+    }
+    else {
+        target.setAttribute('validation', 'false');
+        element.setAttribute('validation', 'false');
+    }
+}
+
+function matches(elements){
+    let failedElements = [];
+    for (let element of elements) {
+        let isValid = element.getAttribute('validation');
+        if (isValid == 'false'){
+            failedElements.push(element);
+        }
+    }
+    if (failedElements.length){
+		render.data({
+			selector: "[template='validate']",
+			data: {
+		        type: 'matches',
+		        status: 'failed',
+		        message: 'One or more values do not match',
+		        selector: '[matches][validation="false"]',
+		        elements: failedElements
+	    	}
+		});
+		return failedElements;
+    }
+}
+
+initMatches();
+
 export {matches};

package/src/validations/required.js

@@ -1,30 +1,30 @@
-// import {validations} from '../index.js';
-import render from '@cocreate/render';
-
-
-export var required = (elements) => {
-    let failedElements = [];
-    for (let element of elements){
-        let value = element.getValue();
-        if (value){
-            element.setAttribute('validation', 'true');
-        }
-        else {
-            element.setAttribute('validation', 'false');
-            failedElements.push(element);
-        }
-    }
-    if (failedElements.length){
-		render.data({
-			selector: "[template='validate']",
-			data: {
-		        type: 'unique',
-		        status: 'failed',
-		        message: 'One or more required fields are missing values',
-				selector: '[required][validation="false"]',
-		        elements: failedElements
-	    	}
-		});
-		return failedElements;
-    }
-};
+// import {validations} from '../index.js';
+import render from '@cocreate/render';
+
+
+export var required = (elements) => {
+    let failedElements = [];
+    for (let element of elements){
+        let value = element.getValue();
+        if (value){
+            element.setAttribute('validation', 'true');
+        }
+        else {
+            element.setAttribute('validation', 'false');
+            failedElements.push(element);
+        }
+    }
+    if (failedElements.length){
+		render.data({
+			selector: "[template='validate']",
+			data: {
+		        type: 'unique',
+		        status: 'failed',
+		        message: 'One or more required fields are missing values',
+				selector: '[required][validation="false"]',
+		        elements: failedElements
+	    	}
+		});
+		return failedElements;
+    }
+};

package/src/validations/subdomain.js

@@ -1,65 +1,65 @@
-import render from '@cocreate/render';
-
-function initSubdomain(){
-    let elements = document.querySelectorAll('[subdomain]');
-    for (let element of elements){
-        element.addEventListener('input', validateSubdomainEvent);
-    }
-}
-
-function validateSubdomainEvent(e){
-    validateSubdomain(e.target);
-}
-
-function validateSubdomain(element){
-    let subdomain = element.getValue();
-    let validation = 'false';
-    if (Array.isArray(subdomain))
-        subdomain = subdomain[0]
-    let array = subdomain.split('.');
-    if (array.length -1 == 2){
-        validation = 'true';
-    }
-
-    const pattern = /^[a-z0-9][a-z0-9\-]*[a-z0-9]$/;
-    if (validation != 'false' && pattern.test(array[0])){
-        validation = 'true';
-    }
-    else
-        validation = 'false';
-    // let array = subdomain.split('.').length -1;
-    // if (validation && array == 2){
-    //     validation = 'true';
-    // }
-   
-    element.setAttribute('validation', validation);
-    return validation;
-}
-
-function subdomain(elements){
-    let failedElements = [];
-    for (let element of elements) {
-        // let isValid = element.getAttribute('subdomain');
-        let isValid = validateSubdomain(element);
-        if (isValid == 'false'){
-            failedElements.push(element);
-        }
-    }
-    if (failedElements.length){
-		render.data({
-			selector: "[template='validate']",
-			data: {
-		        type: 'subdomain',
-		        status: 'failed',
-		        message: 'Enter a valid subdomain. subdomain can only be one level.',
-		        selector: '[subdomain][validation="false"]',
-		        elements: failedElements
-	    	}
-		});
-		return failedElements;
-    }
-}
-
-initSubdomain();
-
+import render from '@cocreate/render';
+
+function initSubdomain(){
+    let elements = document.querySelectorAll('[subdomain]');
+    for (let element of elements){
+        element.addEventListener('input', validateSubdomainEvent);
+    }
+}
+
+function validateSubdomainEvent(e){
+    validateSubdomain(e.target);
+}
+
+function validateSubdomain(element){
+    let subdomain = element.getValue();
+    let validation = 'false';
+    if (Array.isArray(subdomain))
+        subdomain = subdomain[0]
+    let array = subdomain.split('.');
+    if (array.length -1 == 2){
+        validation = 'true';
+    }
+
+    const pattern = /^[a-z0-9][a-z0-9\-]*[a-z0-9]$/;
+    if (validation != 'false' && pattern.test(array[0])){
+        validation = 'true';
+    }
+    else
+        validation = 'false';
+    // let array = subdomain.split('.').length -1;
+    // if (validation && array == 2){
+    //     validation = 'true';
+    // }
+   
+    element.setAttribute('validation', validation);
+    return validation;
+}
+
+function subdomain(elements){
+    let failedElements = [];
+    for (let element of elements) {
+        // let isValid = element.getAttribute('subdomain');
+        let isValid = validateSubdomain(element);
+        if (isValid == 'false'){
+            failedElements.push(element);
+        }
+    }
+    if (failedElements.length){
+		render.data({
+			selector: "[template='validate']",
+			data: {
+		        type: 'subdomain',
+		        status: 'failed',
+		        message: 'Enter a valid subdomain. subdomain can only be one level.',
+		        selector: '[subdomain][validation="false"]',
+		        elements: failedElements
+	    	}
+		});
+		return failedElements;
+    }
+}
+
+initSubdomain();
+
 export {subdomain};

package/src/validations/unique.js

@@ -1,24 +1,24 @@
-import render from '@cocreate/render';
-
-export const unique = (elements) => {
-    let failedElements = [];
-    for (let element of elements) {
-        let unique = element.getAttribute('unique');
-        if (unique == 'false') {
-            failedElements.push(element);
-        }
-    }
-    if (failedElements.length) {
-        render.data({
-            selector: "[template='validate']",
-            data: {
-                type: 'unique',
-                status: 'failed',
-                message: 'One or more values are not unique',
-                selector: '[unique="false"]',
-                elements: failedElements
-            }
-        });
-        return failedElements;
-    }
-};
+import render from '@cocreate/render';
+
+export const unique = (elements) => {
+    let failedElements = [];
+    for (let element of elements) {
+        let unique = element.getAttribute('unique');
+        if (unique == 'false') {
+            failedElements.push(element);
+        }
+    }
+    if (failedElements.length) {
+        render.data({
+            selector: "[template='validate']",
+            data: {
+                type: 'unique',
+                status: 'failed',
+                message: 'One or more values are not unique',
+                selector: '[unique="false"]',
+                elements: failedElements
+            }
+        });
+        return failedElements;
+    }
+};