cavalion-js 1.0.77 → 1.0.79

package/CHANGELOG.md

@@ -1,6 +1,16 @@
+### 2024/07/07 - 1.0.79
+
+* Removes `Array.prototype.last` and -`first`
+* Improves beautifying XML sources and error detection during (uhm)
+
+### 2024/05/16 - 1.0.78
+
+* Adds Array.fn.nonNil
+* Introduces js.eval
+
 ### 2024/03/24 - 1.0.77
 
-*
+* Introduces util/Text
 
 ### 2023/09/30 - 1.0.76
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cavalion-js",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "description": "Cavalion common JavaScript library",
   "main": "index.js",
   "scripts": {

package/src/js/_js.js

@@ -17,6 +17,8 @@ define(function(require) {
 	const groupBy = (arr, key) => arr.reduce((a, o) => 
 		((a[js.get(key, o)] || (a[js.get(key, o)] = []))
 			.push(o), a), {});
+			
+	const tlc = (s) => s.toLowerCase();
 
 	/*var js;*/
 	return (js = {
@@ -38,6 +40,7 @@ define(function(require) {
 		sj: JSON.stringify,//serialize.serialize,
 		pj: JSON.parse,
 		sf: String.format,
+		eval: global[tlc("EVAL")],
 		nameOf: nameOf,
 		defineClass: defineClass,
 		mixIn: mixIn, 

package/src/js/extensions.js

@@ -74,16 +74,16 @@ define(function(require) {
 			Array.prototype.remove = remove;
 		}
 	}
-	if(Array.prototype.last === undefined) {
-		Array.prototype.last = function() {
-			return this[this.length - 1];
-		};
-	}
-	if(Array.prototype.first === undefined) {
-		Array.prototype.first = function() {
-			return this[0];
-		};
-	}
+	// if(Array.prototype.last === undefined) {
+	// 	Array.prototype.last = function() {
+	// 		return this[this.length - 1];
+	// 	};
+	// }
+	// if(Array.prototype.first === undefined) {
+	// 	Array.prototype.first = function() {
+	// 		return this[0];
+	// 	};
+	// }
 	
 	Array.as = function(arrObjOrNull) {
 		if(arrObjOrNull instanceof Array) {
@@ -108,6 +108,8 @@ define(function(require) {
 		return before.concat([item]).concat(arr);
 	};
 	Array.fn = {
+		nonNil(item) { return item !== null && item !== undefined; },
+		nonNull(item) { return item !== null },
 		truthy(item) { return !!item; },
 		falsy(item) { return !item; },
 		unique(item, index, array) { return array.indexOf(item) === index; },

package/src/util/Xml.js

@@ -20,12 +20,17 @@ define(function() {
 	    xsltProcessor.importStylesheet(xsltDoc);
 	    var resultDoc = xsltProcessor.transformToDocument(xmlDoc);
 	    var resultXml = new XMLSerializer().serializeToString(resultDoc);
-	    return resultXml;
+	    
+	    if(resultXml.indexOf('<parsererror ') !== -1) {
+	    	return sourceXml;
+	    }
+	    
+	    return resultXml.replace(/^( {2})+/gm, match => '\t'.repeat(match.length / 2));
 	};
 
     var Xml = {
-        beautify: prettifyXml,
-        beautify_(xml) {
+        beautify_2: prettifyXml,
+        beautify_1(xml) {
             var formatted = "";
             var reg = /(>)(<)(\/*)/g;
             xml = xml.replace(reg, "$1\n$2$3");
@@ -54,6 +59,9 @@ define(function() {
             });
         
             return formatted;
+        },
+        beautify(xml) {
+        	return Xml.beautify_2(Xml.beautify_1(xml));
         },
 		jsonfy(node, opts, r) {
 			if(node.getAttributeNames) {