@cocreate/utils 1.8.0 → 1.9.1

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [1.9.1](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.9.0...v1.9.1) (2022-07-29)
+
+
+### Bug Fixes
+
+* removed console.log ([b237022](https://github.com/CoCreate-app/CoCreate-utils/commit/b2370221c33dc1972eee8204af8a310f9e44721c))
+
+# [1.9.0](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.8.1...v1.9.0) (2022-07-03)
+
+
+### Bug Fixes
+
+* add queryDocumentSelector to export default ([b067ed1](https://github.com/CoCreate-app/CoCreate-utils/commit/b067ed1354488cf52014e2d417d75c5be455fc6f))
+
+
+### Features
+
+* queryDocumentSelector to return one element from an iframe or iframes parent ([477f179](https://github.com/CoCreate-app/CoCreate-utils/commit/477f179ef4e00aab219d12a5a9ae3a5e1cfae992))
+
+## [1.8.1](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.8.0...v1.8.1) (2022-07-01)
+
+
+### Bug Fixes
+
+* remove function queryFrameSelector rhas been replaced by queryDocumentSelectorAll ([3c11054](https://github.com/CoCreate-app/CoCreate-utils/commit/3c110543598ded5753c9d715f3cb650d46e93263))
+
 # [1.8.0](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.7.6...v1.8.0) (2022-07-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/utils",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "description": "A simple utils component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "utils",

package/src/encodedecode.js

@@ -0,0 +1,111 @@
+// function 	__mergeObject(target, source) 
+// {
+// 	target = target || {};
+// 	for (let key of Object.keys(source)) {
+// 		if (source[key] instanceof Object) {
+// 			Object.assign(source[key], __mergeObject(target[key], source[key]))
+// 		}
+// 	}
+	
+// 	Object.assign(target || {}, source)
+// 	return target
+// }
+
+// function __createObject(data, path) 
+// {
+// 	if (!path) return data;
+	
+// 	let keys = path.split('.')
+// 	let newObject = data;
+
+// 	for (var  i = keys.length - 1; i >= 0; i--) {
+// 		newObject = {[keys[i]]: newObject}				
+// 	}
+// 	return newObject;
+// }
+
+// function __createArray(key, data)
+// {
+//   try {
+//     let item = /([\w\W]+)\[(\d+)\]/gm.exec(key)
+//     if (item && item.length == 3) {
+//       let arrayKey = item[1];
+//       let index = parseInt(item[2]);
+      
+//       if (!data[arrayKey] || !Array.isArray(data[arrayKey])) {
+//         data[arrayKey] = [];
+//       } 
+//       data[arrayKey][index] = data[key];
+//       delete data[key];
+//       key = arrayKey;
+//     }
+//   } catch {
+//     console.log('create array error');
+//   }
+//   return key;
+// }
+
+
+
+// function isObject(item) {
+//   return (!!item) && (item.constructor === Object);
+// }
+// function isArray(item) {
+//   return (!!item) && (item.constructor === Array);
+// }
+
+
+// function decodeObject(data) {
+//   let keys = Object.keys(data)
+//   let objectData = {};
+  
+//   keys.forEach((k) => {
+//     k = __createArray(k, data);
+//     if (k.split('.').length > 1) {
+//       let newData = __createObject(data[k], k);
+//       delete data[k];
+      
+//       objectData = __mergeObject(objectData, newData);
+//     } else {
+//       objectData[k] = data[k];
+//     }
+//   })
+//   return objectData;
+// }
+
+// function encodeObject(data) {
+//   let keys = Object.keys(data);
+//   let newData = {};
+//   keys.forEach((k) => {
+//     let data_value = data[k];
+//     if (isObject(data[k])) {
+//       let new_obj = encodeObject(data[k]);
+//       let newKeys = Object.keys(new_obj);
+//       newKeys.forEach((newKey) => {
+//         let value = new_obj[newKey];
+//         if (isNaN(parseInt(newKey))) {
+//           newKey = `${k}.${newKey}`;
+//         } else {
+//           newKey = `${k}[${newKey}]`;
+//         }
+        
+//         newData[newKey] = value;
+//       })
+
+//     } else if (isArray(data_value)){
+//       data_value.forEach((v, index) => {
+//         newData[`${k}[${index}]`] = v;
+//       })
+//     } else {
+//       newData[k] = data[k];
+//     }
+//   })
+//   return newData;
+// }
+
+module.exports = {
+    // decodeObject,
+    // encodeObject,
+    replaceArray
+  };
+  

package/src/index.js

@@ -99,7 +99,7 @@ export function domParser(str) {
     try {
         var mainTag = str.match(/\<(?<tag>[a-z0-9]+)(.*?)?\>/).groups.tag;
     } catch (e){
-        console.log('find position: can not find the main tag');
+        // console.log(e, 'find position: can not find the main tag');
     }
     let doc;
     switch (mainTag) {
@@ -159,6 +159,41 @@ export function queryDocumentSelectorAll(selector) {
 	}
 }
 
+export function queryDocumentSelector(selector) {
+	if (selector) {
+		let selectors = [selector];
+		if(selector.indexOf(',') !== -1){
+			selectors = selector.split(',');
+		}
+		for (let selector of selectors){
+			let el;
+			if(selector.indexOf(';') !== -1) {
+                let targetDocument;
+				let [documentSelector, targetSelector] = selector.split(';');
+				if (['parent', 'parentDocument'].includes(documentSelector))
+                    targetDocument = window.parent.document;
+                else {
+                    let frame = document.querySelector(documentSelector);
+                    if (frame)
+                        targetDocument = frame.contentDocument;
+                }
+                if (targetDocument){
+                    if (targetSelector)
+                        el = targetDocument.querySelector(targetSelector);
+                    else
+                        if (targetDocument.clickedElement)
+                            el = [targetDocument.clickedElement];
+                }
+			}
+			else
+				el = document.querySelector(selector);
+            if (el)
+                return el
+		}
+		return;
+	}
+}
+
 // export function computeStyles(el, properties) {
 //   let computed = window.getComputedStyle(el);
 //   let result = {};
@@ -186,6 +221,6 @@ export default {
   parseTextToHtml,
   cssPath,
   domParser,
-  queryDocumentSelectorAll,
-  queryFrameSelectorAll
+  queryDocumentSelector,
+  queryDocumentSelectorAll
 };

package/src/index.old.js

@@ -425,7 +425,24 @@ async function complexSelector(comSelector, callback) {
     }
   }
   
-  
+  function decodeArray(data) {
+		let keys = Object.keys(data);
+		let objectData = {};
+
+		keys.forEach((k) => {
+			let nk = k
+			if (/\[([0-9]*)\]/g.test(k)) {
+				nk = nk.replace(/\[/g, '.');
+				if (nk.endsWith(']'))
+					nk = nk.slice(0, -1)
+				nk = nk.replace(/\]./g, '.');
+				nk = nk.replace(/\]/g, '.');
+			}
+			objectData[nk] = data[k];
+		});
+		return objectData;
+	}
+
   
 export default {
   getElementPath,