puvox-library 1.0.24 → 1.0.26

package/library_standard.js

@@ -828,30 +828,29 @@ const puvox_library =
 			let finalStr = (withT ? str.replace(' ', 'T') : str);
 			return withMS ? finalStr : finalStr.split('.')[0]; //2022-07-09 19:25:00.276
 		},
-		// in some langs, the date object has distinctions, so the two below needs separated methods
-		StringToDatetimeUtc(str, format, culture) { return new Date(str); }, // DateTime, bool, str
-		StringToDatetimeLocal(str, format, culture) { return new Date(str); }, // DateTime, bool, str
-		UtcDatetime() {  
+		// in some langs, the date object has distinctions, so the two below needs separated methods. However, the "date" object returned from them, are same, just the representation can be local or UTC depending user.
+		StringToDatetimeUtc(str, format, culture) { return new Date(str); }, 
+		StringToDatetimeLocal(str, format, culture) { return new Date(str); }, 
+		DatetimeUtc() {  
 			var now = new Date();
 			var utc = new Date(now.getTime()); // + now.getTimezoneOffset() * 60000 is not needed !!!!!!
 			return utc;
-		},
-		UtcDatetimeFrom(dt) { }, // DateTime
+		}, UtcDatetime() { return this.DatetimeUtc(); },
 		// UTC
-		UtcTimestamp() { 
+		TimestampUtc() { 
 			return Math.floor(new Date().getTime()); 
-		},
+		}, UtcTimestamp() { return this.TimestampUtc(); },
 		//i.e. input:  "2021-03-08 11:59:00"      |  output : 1650000000000 (milliseconds)  
 		// [DONT CHANGE THIS FUNC, I'VE REVISED]
-		UtcTimestampFrom(dt) { 
+		DatetimeToTimestampUtc(dt) { 
 			let offset = this.getOffsetFromUtc();
 			return ((((new Date( dt )).getTime()) / 1000) + 14400 - offset * 60* 60) * 1000; 
-		},
-		UtcTimestampToUtcDatetime(ts) {
+		}, UtcTimestampFrom(dt) { return this.DatetimeToTimestampUtc(dt); },
+		TimestampUtcToDatetimeUtc(ts) {
 			var d = new Date(ts);
 			d.setHours(d.getHours());
 			return d;
-		},
+		}, UtcTimestampToUtcDatetime(ts) { return this.TimestampUtcToDatetimeUtc(ts); },
 		// shorthands
 		MaxDate(d1, d2, d3=null) {},
 		MinDate(d1, d2, d3=null) {},
@@ -1970,16 +1969,16 @@ const puvox_library =
 	parsePOST(request, callback)
 	{
 		if (request.method == 'POST') {
-			let name='querystring';
-			var qs = require(name);
-			let stringData = '';
-			request.on('data', function (data) {
-				stringData += data;
-				// Too much POST data, kill the connection!   1e6 === 1 * Math.pow(10, 6) === 1 * 1000000 ~~~ 1MB
-				if (stringData.length > 1e6)
-					request.connection.destroy();
-			});
-			request.on('end', function(){ callback(qs.parse(stringData)); } );
+			// let name='querystring';// deprecated by URLSearchParams 
+			// var qs = require(name);  
+			// let stringData = '';
+			// request.on('data', function (data) {
+			// 	stringData += data;
+			// 	// Too much POST data, kill the connection!   1e6 === 1 * Math.pow(10, 6) === 1 * 1000000 ~~~ 1MB
+			// 	if (stringData.length > 1e6)
+			// 		request.connection.destroy();
+			// });
+			// request.on('end', function(){ callback(qs.parse(stringData)); } );
 		}
 	},
 
@@ -2407,6 +2406,26 @@ const puvox_library =
 		};
 	},
 	
+	compare(a, b, operator) {
+		if(operator === '==') return a == b;
+		else if (operator === '===') return a === b;
+		else if (operator === '!=') return a != b;
+		else if (operator === '!==') return a !== b;
+		else if (operator === '>') return a > b;
+		else if (operator === '>=') return a >= b;
+		else if (operator === '<') return a < b;
+		else if (operator === '<=') return a <= b;
+		else throw "Unknown operator";
+	},
+	calculate(a, b, operator) {
+		if(operator === '+') return a + b;
+		else if (operator === '-') return a - b;
+		else if (operator === '*') return a * b;
+		else if (operator === '/') return a / b;
+		else if (operator === '%') return a % b;
+		else throw "Unknown operator";
+	},
+
 	// random NUMBER or STRINGS
 	RandomNum(maxNum)		{ return Math.floor((Math.random() * maxNum) + 1); },
 
@@ -2533,8 +2552,7 @@ const puvox_library =
 	openUrlInBrowser(url)
 	{
 		var cmd = (process.platform == 'darwin'? `open ${url}`: process.platform == 'win32'? `start ${url}`: `xdg-open ${url}`); 
-		let name='child_process';
-		require(name).exec(cmd);
+		require('child_process').exec(cmd);
 	},
 
 	stringify(obj_or_str){
@@ -2879,20 +2897,20 @@ const puvox_library =
 
 	// ################################################
 	// for node packs:_fs_instance :null,
-	_required_instances : {},
-	modules(name){
-		if (name in this._required_instances){
-			return this._required_instances[name];
-		} else {
-			this._required_instances[name] = require(name);
-			return this._required_instances[name];
-		}
-	}, 
+	// _required_instances : {},
+	// modules(name){
+	// 	if (name in this._required_instances){
+	// 		return this._required_instances[name];
+	// 	} else {
+	// 		this._required_instances[name] = require(name);
+	// 		return this._required_instances[name];
+	// 	}
+	// }, 
 	file: {
 		parent() {return puvox_library;},
-		fs() {return puvox_library.modules('fs');},
-		os() {return puvox_library.modules('os');},
-		path() {return puvox_library.modules('path');},
+		fs() {return require('fs');}, //puvox_library.modules('fs')
+		os() {return require('os');},
+		path() {return require('path');},
 		//
 		getTempDir(){ return this.os().tmpdir(); },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "puvox-library",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "library-class-javascript",
   "main": "library_standard.js",
   "scripts": {