@cocreate/utils 1.12.7 → 1.13.1

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.13.1](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.13.0...v1.13.1) (2022-12-02)
+
+
+### Bug Fixes
+
+* bump dependencies ([d260b53](https://github.com/CoCreate-app/CoCreate-utils/commit/d260b531473a55becb72c25bc79b1e4924b9331e))
+* docs ([8c98304](https://github.com/CoCreate-app/CoCreate-utils/commit/8c98304bb530b7d1357788ef9b03589cef1fcf4b))
+
+# [1.13.0](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.12.7...v1.13.0) (2022-12-02)
+
+
+### Features
+
+* getValueFromObject returns the defined key value, supports dot notation string. queryData supports logicalOperators and, or ([4d3c5e2](https://github.com/CoCreate-app/CoCreate-utils/commit/4d3c5e273ebe6042f78cb8f85d535468c1bd049d))
+* search param caseSensitive and search can be an array ([50cd481](https://github.com/CoCreate-app/CoCreate-utils/commit/50cd4810bfa0b1e286b30d8418246045e67a2b37))
+
 ## [1.12.7](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.12.6...v1.12.7) (2022-11-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/utils",
-  "version": "1.12.7",
+  "version": "1.13.1",
   "description": "A simple utils component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "utils",
@@ -61,6 +61,6 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/docs": "^1.4.8"
+    "@cocreate/docs": "^1.4.11"
   }
 }

package/src/utils.js

@@ -73,6 +73,31 @@
         }
     }
 
+    function getValueFromObject(json, path) {
+		try {
+			if (typeof json == 'undefined' || !path)
+				return false;
+			
+			if (/\[([0-9]*)\]/g.test(path)) {
+				path = path.replace(/\[/g, '.');
+				if (path.endsWith(']'))
+					path = path.slice(0, -1)
+				path = path.replace(/\]./g, '.');
+				path = path.replace(/\]/g, '.');
+			}
+			let jsonData = json, subpath = path.split('.');
+			
+			for (let i = 0; i < subpath.length; i++) {
+				jsonData = jsonData[subpath[i]];
+				if (!jsonData) return false;
+			}
+			return jsonData;
+		}catch(error){
+			console.log("Error in getValueFromObject", error);
+			return false;
+		}
+	}
+
     function parseTextToHtml(text) {
         let doc = new DOMParser().parseFromString(text, "text/html");
         if (doc.head.children[0]) return doc.head.children[0];
@@ -247,143 +272,200 @@
         }
     }
 
-    function queryData(item, query) {
-		//. $contain, $range, $eq, $ne, $lt, $lte, $gt, $gte, $in, $nin, $geoWithin
-		let flag = true;
-		if (!item)
+    function queryData(data, query) {
+		if (!data)
 			return false;
-		if (!query.length)
-			return true;
-		
-		if (Array.isArray(item)) 
-            return false;
             
-		for (let i = 0; i < query.length; i++) {
-			let fieldValue = item[query[i].name];
-			if (fieldValue == undefined) 
-				fieldValue = ''
-			let values = query[i].value
-			if (!Array.isArray(values))
-				values = [values] 
-			
-			for (let value of values) {
-				switch (query[i].operator) {
-					case '$contain':
-						if (!fieldValue.includes(value)) 
-							flag = false;
-						break;
-					case '$range':
-						if (value !== null && value !== null) {
-							if (value[0] > fieldValue || value[1] <= fieldValue)
-								flag = false;
-						} else if (item.value[0] == null && value[1] >= fieldValue) {
-							flag = false;
-						} else if (item.value[1] == null && value[0] <= fieldValue) {
-							flag = false;
-						}
-						break;
-					case '$eq':
-						if (fieldValue != value) flag = false; 
-						break;
-					case '$ne':
-						if (fieldValue == value) flag = false;
-						break;
-					case '$lt':
-						if (fieldValue >= value) flag = false;
-						break;
-					case '$lte':
-						if (fieldValue > value) flag = false;
-						break;
-					case '$gt':
-						if (fieldValue <= value) flag = false;
-						break;
-					case '$gte':
-						if (fieldValue < value) flag = false;
-						break;
-					case '$in':
-						if (!Array.isArray(fieldValue) || !fieldValue.some(x => value.includes(x))) flag = false;
-						break;
-					case '$nin':
-						if (Array.isArray(fieldValue) && fieldValue.some(x => value.includes(x))) flag = false;
-						break;
-					default:
-						// if (!Array.isArray(fieldValue) || !fieldValue.some(x => value.includes(x))) flag = false;
-						if (fieldValue && !fieldValue.includes(value)) flag = false; 
-						break;
-				}
-			}
-		}
-		return flag;
-	}
+        if (!Array.isArray(data))
+            data = [data]
 
-    function searchData(data, searches) {
-        const search = searches['value']
-        const operator = searches['type']
-        if (!search.length)
+        if (!query)
+            return true
+        
+        if (!Array.isArray(query))
+            query = [query]
+        if (!query.length)
             return true
-        for (var key in data) {
-            let value = data[key];
-            let status = false;
-            
-            if (Array.isArray(value) || typeof value == 'number') {
-                value = value.toString();
-            }
 
-            if (typeof value == 'object') {
-                // run keys of object or JSON.stringify
-            }
-            
-            if (typeof value == 'string') {
-                value = value.toUpperCase();
-            }
+        let queryResult = false
+        for (let n = 0; n < data.length; n++) {
+            for (let i = 0; i < query.length; i++) {
+                let dataValue
+                if (query[i].name.includes('.') || /\[([0-9]*)\]/g.test(query[i].name))
+                    dataValue = getValueFromObject(data[n], query[i].name)
+                else 
+                    dataValue = data[n][query[i].name]
+                if (dataValue == undefined)
+                    dataValue = ''
+                let logicalOperator = query[i].logicalOperator || 'or'
+                let queryValues = query[i].value
+                if (!Array.isArray(queryValues))
+                    queryValues = [queryValues] 
+                
+                let queryStatus = false
+                for (let queryValue of queryValues) {
+                    if (query[i].caseSensitive != 'true' || query[i].caseSensitive != true) {
+                        if (typeof dataValue == 'string') 
+                            dataValue = dataValue.toLowerCase()
+                        if (typeof queryValue == 'string') 
+                            queryValue = queryValue.toLowerCase()
+                    }
 
-            for (let i = 0; i < search.length; i++) {
-                if (typeof search[i] == 'string' && typeof value == 'string') {
-                    if (value.indexOf(search[i].toUpperCase()) > -1) {
-                        status = true;
+                    switch (query[i].operator) {
+                        case '$includes':
+                            if (dataValue.includes(queryValue))
+                                queryStatus = true
+                            break;
+                        case '$eq':
+                            if (dataValue == queryValue)
+                                queryStatus = true
+                            break;
+                        case '$ne':
+                            if (dataValue != queryValue)
+                                queryStatus = true
+                            break;
+                        case '$lt':
+                            if (dataValue > queryValue)
+                                queryStatus = true
+                            break;
+                        case '$lte':
+                            if (dataValue >= queryValue)
+                                queryStatus = true
+                            break;
+                        case '$gt':
+                            if (dataValue < queryValue)
+                                queryStatus = true
+                            break;
+                        case '$gte':
+                            if (dataValue <= queryValue)
+                                queryStatus = true
+                            break;
+                        case '$in':
+                            if (Array.isArray(dataValue) && dataValue.some(x => queryValue.includes(x)))
+                                queryStatus = true
+                            break;
+                        case '$nin':
+                            if (!Array.isArray(dataValue) || !dataValue.some(x => queryValue.includes(x)))
+                                queryStatus = true
+                            break;
+                        case '$range':
+                            if (queryValue[0] !== null && queryValue[1] !== null) {
+                                if (dataValue >= queryValue[0] && dataValue <= queryValue[1])
+                                    queryStatus = true
+                            } else if (queryValue[0] == null && dataValue <= queryValue[1]) {
+                                queryStatus = true
+                            } else if (queryValue[1] == null && dataValue >= queryValue[0]) {
+                                queryStatus = true
+                            }
+                            break;
+
+                        default:
+                            if (dataValue.includes(queryValue)) 
+                                queryStatus = true
+                            break;
                     }
-                } else {
-                    if (value == search[i]) {
-                        status = true;
+                    if (queryStatus == true) {
+                        queryResult = true
+                        break;
                     }
+
                 }
-                if (operator == 'or' && status) {
-                    return true;
+                switch (logicalOperator) {
+                    case 'and':
+                        if (queryStatus == false)
+                            return false
+                        break;
                 }
-                if (operator == 'and' && !status) {
-                    return false;  
+                // if (logicalOperator == 'and' && queryStatus == false)
+                //     return false        
+            }
+        }
+    
+		return queryResult;
+	}
+
+    function searchData(data, search) {
+        if (!search)
+            return true
+        if (!Array.isArray(search))
+            search = [search]
+        for (let i = 0; i < search.length; i++) {
+            let searchValue = search[i].value
+            if (!Array.isArray(searchValue))
+                searchValue = [searchValue]
+            for (let key in data) {
+                let value = data[key];
+                let status = false;
+                switch (typeof value) {
+                    case 'number':
+                        value = value.toString();
+                        break;
+                    case 'object':
+                        value = JSON.stringify(value)
+                        break;
+                    case 'function':
+                        value = value.toString();
+                        break;   
                 }
+                if (search[i].caseSensitive != 'true' || search[i].caseSensitive != true)
+                    value = value.toLowerCase()
+    
+                for (let i = 0; i < searchValue.length; i++) {
+                    let searchString = searchValue[i]
+                    if (search[i].caseSensitive != 'true' || search[i].caseSensitive != true)
+                        searchString = searchString.toLowerCase()
+                    
+                    if (value.indexOf(searchString) > -1)
+                        status = true;
 
-            }  
-        }
-        if (search.length && operator == 'or')
-            return false
+                    if (search[i].operator == 'or' && status)
+                        return true;
+
+                    if (search[i].operator == 'and' && !status)
+                        return false;
 
+                }  
+            }
+            if (search[i].value.length && operator == 'or')
+                return false        
+        
+        }
+        return true
 	}
 		
-	function sortData(data, sorts) {
-		if (!Array.isArray(sorts))
-			sorts = [sorts]
-		for (let sort of sorts) {
-			let name = sort.name
+	function sortData(data, sort) {
+		if (!Array.isArray(sort))
+			sort = [sort]
+		for (let i = 0; i < sort.length; i++) {
+			let name = sort[i].name
 			if (name) {
-				data.sort((a, b) => {
-					if (!a[name])				
-						a[name] = ''
-					if (!b[name])				
-						b[name] = ''
-					if (sort.type == '-1') {
-						if (sort.valueType == 'number')
-							return b[name] - a[name]
-						else
-							return b[name].localeCompare(a[name])
-					} else {
-						if (sort.valueType == 'number')
-							return a[name] - b[name]
-						else
-							return a[name].localeCompare(b[name])
-					}
-				});
+                try {
+                    data.sort((a, b) => {
+                        if (sort[i].direction == '-1') {
+                            switch (typeof b[name]) {
+                                case 'string':
+                                    return b[name].localeCompare(a[name])
+                                case 'number':
+                                    return b[name] - a[name]
+                                case 'array':
+                                case 'object':
+                                    break;
+                            }
+                        } else {
+                            switch (typeof a[name]) {
+                                case 'string':
+                                    return a[name].localeCompare(b[name])
+                                case 'number':
+                                    return a[name] - b[name]
+                                case 'array':
+                                case 'object':
+                                    break;
+                            }
+                        }
+                    });
+                } catch (error) {
+                    console.log(error)
+                }
 			}
 		}
 		return data;
@@ -416,6 +498,7 @@
     return {
         parseTextToHtml,
         dotNotationToObject,
+        getValueFromObject,
         cssPath,
         domParser,
         queryDocumentSelector,