alasql 4.7.0 → 4.9.0

package/README.md

@@ -1,6 +1,6 @@
-- _AlaSQL is an unfunded open source project installed 500k+ times each month. [Please donate your time](https://github.com/AlaSQL/alasql/issues?q=is%3Aopen+label%3A%22Help+wanted%22+sort%3Aupdated-desc). We appreciate any and all contributions we can get._
+- _AlaSQL is an unfunded open source project installed 650k+ times each month. [Please donate your time](https://github.com/AlaSQL/alasql/issues?q=is%3Aopen+label%3A%22Help+wanted%22+sort%3Aupdated-desc). We appreciate any and all contributions we can get._
 
-- _Have a question? [Ask the AlaSQL bot](https://chat.openai.com/g/g-XcBL24WTe-alasql-bot) or post on [Stack Overflow](http://stackoverflow.com/questions/ask?tags=AlaSQL)._
+- _Have a question? [Ask The AlaSQL Bot](https://chatgpt.com/g/g-XcBL24WTe-alasql-bot) or post on [Stack Overflow](http://stackoverflow.com/questions/ask?tags=AlaSQL)._
 
 [![CI-test](https://github.com/alasql/alasql/workflows/CI%20build%20&%20test/badge.svg)](https://github.com/alasql/alasql/actions)
 [![NPM downloads](http://img.shields.io/npm/dm/alasql.svg?style=flat&label=npm%20downloads)](https://npm-stat.com/charts.html?package=alasql)

package/bin/alasql-cli.js

@@ -10,7 +10,6 @@
 let alasql = require('../dist/alasql.fs.js');
 let path = require('path');
 let fs = require('fs');
-let stdin = process.openStdin();
 let yargs = require('yargs')
 	.strict()
 	.usage(
@@ -58,44 +57,73 @@ let yargs = require('yargs')
 	.epilog('\nMore information about the library: www.alasql.org');
 
 let argv = yargs.argv;
-let sql = '';
-let params = [];
-let pipedData = '';
-stdin.on('data', function (chunk) {
-	pipedData += chunk;
-});
 
-if (argv.v) {
-	console.log(alasql.version);
-	process.exit(0);
+// Regex patterns for detecting functions
+const re = {
+	txt: /txt\s*\(\s*\)/i,
+};
+
+// Helper function to check if SQL contains txt() and stdin is piped
+function isPipeData(sql) {
+	return sql && !process.stdin.isTTY && re.txt.test(sql);
 }
 
-if (argv.f) {
-	if (!fs.existsSync(argv.f)) {
+// Helper function to setup stdin handling
+function pipeIsSQL() {
+	const stdin = process.openStdin();
+	let pipedData = '';
+	stdin.on('data', function (chunk) {
+		pipedData += chunk;
+	});
+	stdin.on('end', function () {
+		execute(pipedData, argv._);
+	});
+	return stdin;
+}
+
+// Helper function to load and validate SQL file
+function loadSqlFile(filePath) {
+	if (!fs.existsSync(filePath)) {
 		console.error('Error: file not found');
 		process.exit(1);
 	}
-
-	if (isDirectory(argv.f)) {
+	if (isDirectory(filePath)) {
 		console.error('Error: file expected but directory found');
 		process.exit(1);
 	}
+	return fs.readFileSync(filePath, 'utf8').toString();
+}
+
+// Main execution logic
+function main() {
+	let sql = '';
+	let pipeIsData = false;
+
+	if (argv.f) {
+		sql = loadSqlFile(argv.f);
+		pipeIsData = isPipeData(sql);
+	} else {
+		sql = argv._.shift() || '';
+		pipeIsData = isPipeData(sql);
+	}
 
-	sql = fs.readFileSync(argv.f, 'utf8').toString();
-	execute(sql, argv._);
-} else {
-	sql = argv._.shift() || '';
+	// Setup stdin handling only if not using txt() pipe
+	if (!pipeIsData) {
+		pipeIsSQL();
+	}
 
-	// if data is not piped
-	if (Boolean(process.stdin.isTTY)) {
+	// Execute immediately if we have SQL or are using txt() pipe
+	if (sql || pipeIsData) {
 		execute(sql, argv._);
 	}
 }
 
-// if data is piped
-stdin.on('end', function () {
-	execute(pipedData, argv._);
-});
+if (argv.v) {
+	console.log(alasql.version);
+	process.exit(0);
+}
+
+main();
 
 /**
  * Execute SQL query

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.6.6 build: develop-272b12b3 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.8.0 build: develop-af967432 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.6.6
+@version 4.8.0
 
 AlaSQL - JavaScript SQL database
 © 2014-2024	Andrey Gershun & Mathias Wulff

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.6.6 build: develop-272b12b3 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.8.0 build: develop-af967432 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.6.6
+@version 4.8.0
 
 AlaSQL - JavaScript SQL database
 © 2014-2024	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ SOFTWARE.
 		Current version of alasql
 		  @constant {string}
 	*/
-	alasql.version = '4.6.6';
-	alasql.build = 'develop-272b12b3';
+	alasql.version = '4.8.0';
+	alasql.build = 'develop-af967432';
 
 	/**
 		Debug flag
@@ -244,7 +244,7 @@ case 1:
 
 break;
 case 2:
- this.$ = doubleq($$[$0].substr(1,$$[$0].length-2)); 
+ this.$ = doubleq($$[$0].substr(1,$$[$0].length-2));
 break;
 case 3:
  this.$ = $$[$0].toLowerCase() 
@@ -3487,7 +3487,7 @@ let loadFile = (utils.loadFile = function (path, asy, success, error) {
 		fs = require('fs');
 
 		// If path is empty, than read data from stdin (for Node)
-		if (typeof path === 'undefined') {
+		if ([null, undefined].includes(path)) {
 			var buff = '';
 			process.stdin.setEncoding('utf8');
 			process.stdin.on('readable', function () {
@@ -8443,9 +8443,9 @@ yy.Select.prototype.compileGroup = function (query) {
 					if (col.aggregatorid === 'SUM') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-							return `'${colas}':(${colexp1})|| typeof ${colexp1} == 'number' ? ${colexp} : null,`;
+							return `'${colas}':(__alasql_tmp = ${colexp}, (__alasql_tmp instanceof Date) ? undefined : ((__alasql_tmp || typeof __alasql_tmp == 'number') ? __alasql_tmp : undefined)),`;
 						}
-						return `'${colas}':(${colexp})|| typeof ${colexp} == 'number' ? ${colexp} : null,`;
+						return `'${colas}':(__alasql_tmp = ${colexp}, (__alasql_tmp instanceof Date) ? undefined : ((__alasql_tmp || typeof __alasql_tmp == 'number') ? __alasql_tmp : undefined)),`;
 					} else if (col.aggregatorid === 'TOTAL') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
@@ -8462,19 +8462,16 @@ yy.Select.prototype.compileGroup = function (query) {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
 
-							return `'${colas}': (typeof ${colexp1} == 'number' || typeof ${colexp1} == 'bigint' ? ${colexp} : typeof ${colexp1} == 'object' ?
-							typeof Number(${colexp1}) == 'number' && ${colexp1}!== null? ${colexp} : null : null),`;
+							return `'${colas}': (__alasql_tmp = ${colexp}, typeof __alasql_tmp == 'number' || typeof __alasql_tmp == 'bigint' || (typeof __alasql_tmp == 'object' && (typeof Number(__alasql_tmp) == 'number' || __alasql_tmp instanceof Date)) ? __alasql_tmp : undefined),`;
 						}
-						return `'${colas}': (typeof ${colexp} == 'number' || typeof ${colexp} == 'bigint' ? ${colexp} : typeof ${colexp} == 'object' ?
-							typeof Number(${colexp}) == 'number' && ${colexp}!== null? ${colexp} : null : null),`;
+						return `'${colas}': (__alasql_tmp = ${colexp}, typeof __alasql_tmp == 'number' || typeof __alasql_tmp == 'bigint' || (typeof __alasql_tmp == 'object' && (typeof Number(__alasql_tmp) == 'number' || __alasql_tmp instanceof Date)) ? __alasql_tmp : undefined),`;
 					} else if (col.aggregatorid === 'MAX') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-							return `'${colas}' : (typeof ${colexp1} == 'number' || typeof ${colexp1} == 'bigint' ? ${colexp} : typeof ${colexp1} == 'object' ?
-							typeof Number(${colexp1}) == 'number' ? ${colexp} : null : null),`;
+							return `'${colas}': (__alasql_tmp = ${colexp}, typeof __alasql_tmp == 'number' || typeof __alasql_tmp == 'bigint' || (typeof __alasql_tmp == 'object' && (typeof Number(__alasql_tmp) == 'number' || __alasql_tmp instanceof Date)) ? __alasql_tmp : undefined),`;
 						}
 						return `'${colas}' : (typeof ${colexp} == 'number' || typeof ${colexp} == 'bigint' ? ${colexp} : typeof ${colexp} == 'object' ?
-							typeof Number(${colexp}) == 'number' ? ${colexp} : null : null),`;
+							typeof Number(${colexp}) == 'number' ? ${colexp} : undefined : undefined),`;
 					} else if (col.aggregatorid === 'ARRAY') {
 						return `'${colas}':[${colexp}],`;
 					} else if (col.aggregatorid === 'COUNT') {
@@ -8487,7 +8484,7 @@ yy.Select.prototype.compileGroup = function (query) {
 						query.removeKeys.push(`_SUM_${colas}`);
 						query.removeKeys.push(`_COUNT_${colas}`);
 
-						return `'${colas}':${colexp},'_SUM_${colas}':(${colexp})||0,'_COUNT_${colas}':(typeof ${colexp} == "undefined" || ${colexp} === null) ? 0 : 1,`;
+						return `'${colas}':(function() { var t = ${colexp}; return (t instanceof Date) ? undefined : t; })(),'_SUM_${colas}':(function() { var t = ${colexp}; return (t instanceof Date) ? undefined : (t || 0); })(),'_COUNT_${colas}':(typeof ${colexp} == "undefined" || ${colexp} === null) ? 0 : 1,`;
 					} else if (col.aggregatorid === 'AGGR') {
 						aft += `,g['${colas}']=${col.expression.toJS('g', -1)}`;
 						return '';
@@ -8531,17 +8528,20 @@ yy.Select.prototype.compileGroup = function (query) {
 									const __colexp1 = ${colexp1};
 
 									if (__g_colas == null && ${colexp1} == null) {
-										g['${colas}'] = null;
+										g['${colas}'] = undefined;
 									} else if (typeof __g_colas === 'bigint' || typeof __colexp1 === 'bigint') {
             					    	g['${colas}'] = BigInt(__g_colas) + BigInt(__colexp);
             						} else if ((typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp1 !== 'object' && __typeof_colexp1 !== 'number') ||
-											   (__g_colas == null || (typeof __g_colas !== 'number' && typeof __g_colas !== 'object')) && (${colexp1} == null || (__typeof_colexp1 !== 'number' && __typeof_colexp1 !== 'object'))) {
-										g['${colas}'] = null;
+										   (__g_colas == null || (typeof __g_colas !== 'number' && typeof __g_colas !== 'object')) && (${colexp1} == null || (__typeof_colexp1 !== 'number' && __typeof_colexp1 !== 'object'))) {
+										g['${colas}'] = undefined;
 									} else if ((typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp1 == 'number') ||
 											   (__g_colas == null && __typeof_colexp1 == 'number')) {
 										g['${colas}'] = ${colexp};
 									} else if (typeof __g_colas == 'number' && ${colexp1} == null) {
 										g['${colas}'] = __g_colas;
+									} else if (__g_colas instanceof Date || __colexp1 instanceof Date) {
+										// Date objects cause string concatenation with +=, return undefined instead
+										g['${colas}'] = undefined;
 									} else {
 										g['${colas}'] += ${colexp} || 0;
 									}
@@ -8559,23 +8559,26 @@ yy.Select.prototype.compileGroup = function (query) {
 								const __colexp = ${colexp};
 
 								if (__g_colas == null && ${colexp} == null) {
-									g['${colas}'] = null;
+									g['${colas}'] = undefined;
 								} else if (typeof __g_colas === 'bigint' || typeof __colexp === 'bigint') {
             					    g['${colas}'] = BigInt(__g_colas) + BigInt(__colexp);
             					} else if ((typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp !== 'object' && __typeof_colexp !== 'number') ||
 										   (__g_colas == null || (typeof __g_colas !== 'number' && typeof __g_colas !== 'object')) && (${colexp} == null || (__typeof_colexp !== 'number' && __typeof_colexp !== 'object'))) {
-									g['${colas}'] = null;
-								} else if (typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp == 'number') {
-									g['${colas}'] = ${colexp};
-								} else if (typeof __g_colas == 'number' && ${colexp} == null) {
-									g['${colas}'] = __g_colas;
-								} else if (__g_colas == null && __typeof_colexp == 'number') {
-									g['${colas}'] = ${colexp};
-								} else {
-									g['${colas}'] += ${colexp} || 0;
-								}
+								g['${colas}'] = undefined;
+							} else if (typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp == 'number') {
+								g['${colas}'] = ${colexp};
+							} else if (typeof __g_colas == 'number' && ${colexp} == null) {
+								g['${colas}'] = __g_colas;
+							} else if (__g_colas == null && __typeof_colexp == 'number') {
+								g['${colas}'] = ${colexp};
+							} else if (__g_colas instanceof Date || __colexp instanceof Date) {
+								// Date objects cause string concatenation with +=, return undefined instead
+								g['${colas}'] = undefined;
+							} else {
+								g['${colas}'] += ${colexp} || 0;
 							}
-							` +
+						}
+						` +
 							post
 						);
 					} else if (col.aggregatorid === 'TOTAL') {
@@ -8714,19 +8717,19 @@ yy.Select.prototype.compileGroup = function (query) {
 						}
 						return (
 							pre +
-							`if((g['${colas}'] == null && ${colexp}!== null) ? y = ${colexp} : 
-								(g['${colas}']!== null && ${colexp} == null) ? y = g['${colas}'] : 
-								((y=${colexp}) > g['${colas}'])) { 
-								if(typeof y == 'number' || typeof y == 'bigint') {
-									g['${colas}'] = y;
-								} else if(typeof y == 'object' && y instanceof Date) {
-									g['${colas}'] = y;
-								} else if(typeof y == 'object' && typeof Number(y) == 'number') {
-									g['${colas}'] = Number(y);
+							`if ((g['${colas}'] == null && ${colexp} !== null) ? y = ${colexp} : 
+								(g['${colas}'] !== null && ${colexp} == null) ? y = g['${colas}'] : 
+								((y = ${colexp}) > g['${colas}'])) {
+								if (typeof y == 'number' || typeof y == 'bigint') {
+								  g['${colas}'] = y;
+								} else if (typeof y == 'object' && y instanceof Date) {
+								  g['${colas}'] = y;
+								} else if (typeof y == 'object' && typeof Number(y) == 'number') {
+								  g['${colas}'] = Number(y);
 								}
-							} else if(g['${colas}']!== null && typeof g['${colas}'] == 'object' && y instanceof Date) {
+							} else if (g['${colas}'] !== null && typeof g['${colas}'] == 'object' && y instanceof Date) {
 								g['${colas}'] = g['${colas}'];
-							} else if(g['${colas}']!== null && typeof g['${colas}'] == 'object') {
+							} else if (g['${colas}'] !== null && typeof g['${colas}'] == 'object') {
 								g['${colas}'] = Number(g['${colas}']);
 							}` +
 							post
@@ -8739,7 +8742,11 @@ yy.Select.prototype.compileGroup = function (query) {
 						return `${pre}
 							y= (${colexp});
 							g['_COUNT_${colas}'] += (typeof y == "undefined" || y === null) ? 0 : 1;
-							if (typeof g['_SUM_${colas}'] === 'bigint' || typeof y === 'bigint') {
+							if (y instanceof Date || (g['_SUM_${colas}'] && g['_SUM_${colas}'] instanceof Date)) {
+							// AVG on Date objects doesn't make semantic sense - return undefined
+							g['_SUM_${colas}'] = undefined;
+							g['${colas}'] = undefined;
+							} else if (typeof g['_SUM_${colas}'] === 'bigint' || typeof y === 'bigint') {
 								g['_SUM_${colas}'] = BigInt(g['_SUM_${colas}']);
 								g['_SUM_${colas}'] += BigInt(y || 0);
     							g['${colas}'] = BigInt(g['_SUM_${colas}']) / BigInt(g['_COUNT_${colas}']); 
@@ -11270,9 +11277,21 @@ stdlib.RANDOM = function (r) {
 };
 stdlib.ROUND = function (s, d) {
 	if (arguments.length == 2) {
-		return 'Math.round((' + s + ')*Math.pow(10,(' + d + ')))/Math.pow(10,(' + d + '))';
+		return (
+			'(__alasql_tmp = (' +
+			s +
+			'), (__alasql_tmp == null || (typeof __alasql_tmp === "string" && __alasql_tmp.trim() === "")) ? undefined : ((__alasql_tmp = Number(__alasql_tmp)), isNaN(__alasql_tmp) ? undefined : Math.round(__alasql_tmp*Math.pow(10,(' +
+			d +
+			')))/Math.pow(10,(' +
+			d +
+			'))))'
+		);
 	} else {
-		return 'Math.round(' + s + ')';
+		return (
+			'(__alasql_tmp = (' +
+			s +
+			'), (__alasql_tmp == null || (typeof __alasql_tmp === "string" && __alasql_tmp.trim() === "")) ? undefined : ((__alasql_tmp = Number(__alasql_tmp)), isNaN(__alasql_tmp) ? undefined : Math.round(__alasql_tmp)))'
+		);
 	}
 };
 stdlib.CEIL = stdlib.CEILING = function (s) {
@@ -16549,7 +16568,7 @@ alasql.from.JSON = function (filename, opts, cb, idx, query) {
 	var res;
 
 	filename = alasql.utils.autoExtFilename(filename, 'json', opts);
-	alasql.utils.loadFile(filename, !!cb, function (data) {
+	(alasql.utils.loadFile(filename, !!cb, function (data) {
 
 		//		res = [{a:1}];
 		res = JSON.parse(data);
@@ -16559,12 +16578,12 @@ alasql.from.JSON = function (filename, opts, cb, idx, query) {
 	}),
 		err => {
 			const error = err instanceof Error ? err : new Error(err);
-			if(query && query.cb) {
+			if (query && query.cb) {
 				query.cb(null, error);
 				return;
 			}
 			throw error;
-		};
+		});
 	return res;
 };
 
@@ -16593,7 +16612,7 @@ const jsonl = ext => {
 			},
 			err => {
 				const error = err instanceof Error ? err : new Error(err);
-				if(query && query.cb) {
+				if (query && query.cb) {
 					query.cb(null, error);
 					return;
 				}
@@ -16669,7 +16688,7 @@ alasql.from.CSV = function (contents, opts, cb, idx, query) {
 				return EOF;
 			}
 			if (eol) {
-				return (eol = false), EOL;
+				return ((eol = false), EOL);
 			}
 			var j = I;
 			if (text.charCodeAt(j) === quoteCode) {

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.6.6 build: develop-272b12b3 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.8.0 build: develop-af967432 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.6.6
+@version 4.8.0
 
 AlaSQL - JavaScript SQL database
 © 2014-2024	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ SOFTWARE.
 		Current version of alasql
 		  @constant {string}
 	*/
-	alasql.version = '4.6.6';
-	alasql.build = 'develop-272b12b3';
+	alasql.version = '4.8.0';
+	alasql.build = 'develop-af967432';
 
 	/**
 		Debug flag
@@ -244,7 +244,7 @@ case 1:
 
 break;
 case 2:
- this.$ = doubleq($$[$0].substr(1,$$[$0].length-2)); 
+ this.$ = doubleq($$[$0].substr(1,$$[$0].length-2));
 break;
 case 3:
  this.$ = $$[$0].toLowerCase() 
@@ -3487,7 +3487,7 @@ let loadFile = (utils.loadFile = function (path, asy, success, error) {
 		fs = require('fs');
 
 		// If path is empty, than read data from stdin (for Node)
-		if (typeof path === 'undefined') {
+		if ([null, undefined].includes(path)) {
 			var buff = '';
 			process.stdin.setEncoding('utf8');
 			process.stdin.on('readable', function () {
@@ -8443,9 +8443,9 @@ yy.Select.prototype.compileGroup = function (query) {
 					if (col.aggregatorid === 'SUM') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-							return `'${colas}':(${colexp1})|| typeof ${colexp1} == 'number' ? ${colexp} : null,`;
+							return `'${colas}':(__alasql_tmp = ${colexp}, (__alasql_tmp instanceof Date) ? undefined : ((__alasql_tmp || typeof __alasql_tmp == 'number') ? __alasql_tmp : undefined)),`;
 						}
-						return `'${colas}':(${colexp})|| typeof ${colexp} == 'number' ? ${colexp} : null,`;
+						return `'${colas}':(__alasql_tmp = ${colexp}, (__alasql_tmp instanceof Date) ? undefined : ((__alasql_tmp || typeof __alasql_tmp == 'number') ? __alasql_tmp : undefined)),`;
 					} else if (col.aggregatorid === 'TOTAL') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
@@ -8462,19 +8462,16 @@ yy.Select.prototype.compileGroup = function (query) {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
 
-							return `'${colas}': (typeof ${colexp1} == 'number' || typeof ${colexp1} == 'bigint' ? ${colexp} : typeof ${colexp1} == 'object' ?
-							typeof Number(${colexp1}) == 'number' && ${colexp1}!== null? ${colexp} : null : null),`;
+							return `'${colas}': (__alasql_tmp = ${colexp}, typeof __alasql_tmp == 'number' || typeof __alasql_tmp == 'bigint' || (typeof __alasql_tmp == 'object' && (typeof Number(__alasql_tmp) == 'number' || __alasql_tmp instanceof Date)) ? __alasql_tmp : undefined),`;
 						}
-						return `'${colas}': (typeof ${colexp} == 'number' || typeof ${colexp} == 'bigint' ? ${colexp} : typeof ${colexp} == 'object' ?
-							typeof Number(${colexp}) == 'number' && ${colexp}!== null? ${colexp} : null : null),`;
+						return `'${colas}': (__alasql_tmp = ${colexp}, typeof __alasql_tmp == 'number' || typeof __alasql_tmp == 'bigint' || (typeof __alasql_tmp == 'object' && (typeof Number(__alasql_tmp) == 'number' || __alasql_tmp instanceof Date)) ? __alasql_tmp : undefined),`;
 					} else if (col.aggregatorid === 'MAX') {
 						if ('funcid' in col.expression) {
 							let colexp1 = colExpIfFunIdExists(col.expression);
-							return `'${colas}' : (typeof ${colexp1} == 'number' || typeof ${colexp1} == 'bigint' ? ${colexp} : typeof ${colexp1} == 'object' ?
-							typeof Number(${colexp1}) == 'number' ? ${colexp} : null : null),`;
+							return `'${colas}': (__alasql_tmp = ${colexp}, typeof __alasql_tmp == 'number' || typeof __alasql_tmp == 'bigint' || (typeof __alasql_tmp == 'object' && (typeof Number(__alasql_tmp) == 'number' || __alasql_tmp instanceof Date)) ? __alasql_tmp : undefined),`;
 						}
 						return `'${colas}' : (typeof ${colexp} == 'number' || typeof ${colexp} == 'bigint' ? ${colexp} : typeof ${colexp} == 'object' ?
-							typeof Number(${colexp}) == 'number' ? ${colexp} : null : null),`;
+							typeof Number(${colexp}) == 'number' ? ${colexp} : undefined : undefined),`;
 					} else if (col.aggregatorid === 'ARRAY') {
 						return `'${colas}':[${colexp}],`;
 					} else if (col.aggregatorid === 'COUNT') {
@@ -8487,7 +8484,7 @@ yy.Select.prototype.compileGroup = function (query) {
 						query.removeKeys.push(`_SUM_${colas}`);
 						query.removeKeys.push(`_COUNT_${colas}`);
 
-						return `'${colas}':${colexp},'_SUM_${colas}':(${colexp})||0,'_COUNT_${colas}':(typeof ${colexp} == "undefined" || ${colexp} === null) ? 0 : 1,`;
+						return `'${colas}':(function() { var t = ${colexp}; return (t instanceof Date) ? undefined : t; })(),'_SUM_${colas}':(function() { var t = ${colexp}; return (t instanceof Date) ? undefined : (t || 0); })(),'_COUNT_${colas}':(typeof ${colexp} == "undefined" || ${colexp} === null) ? 0 : 1,`;
 					} else if (col.aggregatorid === 'AGGR') {
 						aft += `,g['${colas}']=${col.expression.toJS('g', -1)}`;
 						return '';
@@ -8531,17 +8528,20 @@ yy.Select.prototype.compileGroup = function (query) {
 									const __colexp1 = ${colexp1};
 
 									if (__g_colas == null && ${colexp1} == null) {
-										g['${colas}'] = null;
+										g['${colas}'] = undefined;
 									} else if (typeof __g_colas === 'bigint' || typeof __colexp1 === 'bigint') {
             					    	g['${colas}'] = BigInt(__g_colas) + BigInt(__colexp);
             						} else if ((typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp1 !== 'object' && __typeof_colexp1 !== 'number') ||
-											   (__g_colas == null || (typeof __g_colas !== 'number' && typeof __g_colas !== 'object')) && (${colexp1} == null || (__typeof_colexp1 !== 'number' && __typeof_colexp1 !== 'object'))) {
-										g['${colas}'] = null;
+										   (__g_colas == null || (typeof __g_colas !== 'number' && typeof __g_colas !== 'object')) && (${colexp1} == null || (__typeof_colexp1 !== 'number' && __typeof_colexp1 !== 'object'))) {
+										g['${colas}'] = undefined;
 									} else if ((typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp1 == 'number') ||
 											   (__g_colas == null && __typeof_colexp1 == 'number')) {
 										g['${colas}'] = ${colexp};
 									} else if (typeof __g_colas == 'number' && ${colexp1} == null) {
 										g['${colas}'] = __g_colas;
+									} else if (__g_colas instanceof Date || __colexp1 instanceof Date) {
+										// Date objects cause string concatenation with +=, return undefined instead
+										g['${colas}'] = undefined;
 									} else {
 										g['${colas}'] += ${colexp} || 0;
 									}
@@ -8559,23 +8559,26 @@ yy.Select.prototype.compileGroup = function (query) {
 								const __colexp = ${colexp};
 
 								if (__g_colas == null && ${colexp} == null) {
-									g['${colas}'] = null;
+									g['${colas}'] = undefined;
 								} else if (typeof __g_colas === 'bigint' || typeof __colexp === 'bigint') {
             					    g['${colas}'] = BigInt(__g_colas) + BigInt(__colexp);
             					} else if ((typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp !== 'object' && __typeof_colexp !== 'number') ||
 										   (__g_colas == null || (typeof __g_colas !== 'number' && typeof __g_colas !== 'object')) && (${colexp} == null || (__typeof_colexp !== 'number' && __typeof_colexp !== 'object'))) {
-									g['${colas}'] = null;
-								} else if (typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp == 'number') {
-									g['${colas}'] = ${colexp};
-								} else if (typeof __g_colas == 'number' && ${colexp} == null) {
-									g['${colas}'] = __g_colas;
-								} else if (__g_colas == null && __typeof_colexp == 'number') {
-									g['${colas}'] = ${colexp};
-								} else {
-									g['${colas}'] += ${colexp} || 0;
-								}
+								g['${colas}'] = undefined;
+							} else if (typeof __g_colas !== 'object' && typeof __g_colas !== 'number' && __typeof_colexp == 'number') {
+								g['${colas}'] = ${colexp};
+							} else if (typeof __g_colas == 'number' && ${colexp} == null) {
+								g['${colas}'] = __g_colas;
+							} else if (__g_colas == null && __typeof_colexp == 'number') {
+								g['${colas}'] = ${colexp};
+							} else if (__g_colas instanceof Date || __colexp instanceof Date) {
+								// Date objects cause string concatenation with +=, return undefined instead
+								g['${colas}'] = undefined;
+							} else {
+								g['${colas}'] += ${colexp} || 0;
 							}
-							` +
+						}
+						` +
 							post
 						);
 					} else if (col.aggregatorid === 'TOTAL') {
@@ -8714,19 +8717,19 @@ yy.Select.prototype.compileGroup = function (query) {
 						}
 						return (
 							pre +
-							`if((g['${colas}'] == null && ${colexp}!== null) ? y = ${colexp} : 
-								(g['${colas}']!== null && ${colexp} == null) ? y = g['${colas}'] : 
-								((y=${colexp}) > g['${colas}'])) { 
-								if(typeof y == 'number' || typeof y == 'bigint') {
-									g['${colas}'] = y;
-								} else if(typeof y == 'object' && y instanceof Date) {
-									g['${colas}'] = y;
-								} else if(typeof y == 'object' && typeof Number(y) == 'number') {
-									g['${colas}'] = Number(y);
+							`if ((g['${colas}'] == null && ${colexp} !== null) ? y = ${colexp} : 
+								(g['${colas}'] !== null && ${colexp} == null) ? y = g['${colas}'] : 
+								((y = ${colexp}) > g['${colas}'])) {
+								if (typeof y == 'number' || typeof y == 'bigint') {
+								  g['${colas}'] = y;
+								} else if (typeof y == 'object' && y instanceof Date) {
+								  g['${colas}'] = y;
+								} else if (typeof y == 'object' && typeof Number(y) == 'number') {
+								  g['${colas}'] = Number(y);
 								}
-							} else if(g['${colas}']!== null && typeof g['${colas}'] == 'object' && y instanceof Date) {
+							} else if (g['${colas}'] !== null && typeof g['${colas}'] == 'object' && y instanceof Date) {
 								g['${colas}'] = g['${colas}'];
-							} else if(g['${colas}']!== null && typeof g['${colas}'] == 'object') {
+							} else if (g['${colas}'] !== null && typeof g['${colas}'] == 'object') {
 								g['${colas}'] = Number(g['${colas}']);
 							}` +
 							post
@@ -8739,7 +8742,11 @@ yy.Select.prototype.compileGroup = function (query) {
 						return `${pre}
 							y= (${colexp});
 							g['_COUNT_${colas}'] += (typeof y == "undefined" || y === null) ? 0 : 1;
-							if (typeof g['_SUM_${colas}'] === 'bigint' || typeof y === 'bigint') {
+							if (y instanceof Date || (g['_SUM_${colas}'] && g['_SUM_${colas}'] instanceof Date)) {
+							// AVG on Date objects doesn't make semantic sense - return undefined
+							g['_SUM_${colas}'] = undefined;
+							g['${colas}'] = undefined;
+							} else if (typeof g['_SUM_${colas}'] === 'bigint' || typeof y === 'bigint') {
 								g['_SUM_${colas}'] = BigInt(g['_SUM_${colas}']);
 								g['_SUM_${colas}'] += BigInt(y || 0);
     							g['${colas}'] = BigInt(g['_SUM_${colas}']) / BigInt(g['_COUNT_${colas}']); 
@@ -11270,9 +11277,21 @@ stdlib.RANDOM = function (r) {
 };
 stdlib.ROUND = function (s, d) {
 	if (arguments.length == 2) {
-		return 'Math.round((' + s + ')*Math.pow(10,(' + d + ')))/Math.pow(10,(' + d + '))';
+		return (
+			'(__alasql_tmp = (' +
+			s +
+			'), (__alasql_tmp == null || (typeof __alasql_tmp === "string" && __alasql_tmp.trim() === "")) ? undefined : ((__alasql_tmp = Number(__alasql_tmp)), isNaN(__alasql_tmp) ? undefined : Math.round(__alasql_tmp*Math.pow(10,(' +
+			d +
+			')))/Math.pow(10,(' +
+			d +
+			'))))'
+		);
 	} else {
-		return 'Math.round(' + s + ')';
+		return (
+			'(__alasql_tmp = (' +
+			s +
+			'), (__alasql_tmp == null || (typeof __alasql_tmp === "string" && __alasql_tmp.trim() === "")) ? undefined : ((__alasql_tmp = Number(__alasql_tmp)), isNaN(__alasql_tmp) ? undefined : Math.round(__alasql_tmp)))'
+		);
 	}
 };
 stdlib.CEIL = stdlib.CEILING = function (s) {
@@ -16549,7 +16568,7 @@ alasql.from.JSON = function (filename, opts, cb, idx, query) {
 	var res;
 
 	filename = alasql.utils.autoExtFilename(filename, 'json', opts);
-	alasql.utils.loadFile(filename, !!cb, function (data) {
+	(alasql.utils.loadFile(filename, !!cb, function (data) {
 
 		//		res = [{a:1}];
 		res = JSON.parse(data);
@@ -16559,12 +16578,12 @@ alasql.from.JSON = function (filename, opts, cb, idx, query) {
 	}),
 		err => {
 			const error = err instanceof Error ? err : new Error(err);
-			if(query && query.cb) {
+			if (query && query.cb) {
 				query.cb(null, error);
 				return;
 			}
 			throw error;
-		};
+		});
 	return res;
 };
 
@@ -16593,7 +16612,7 @@ const jsonl = ext => {
 			},
 			err => {
 				const error = err instanceof Error ? err : new Error(err);
-				if(query && query.cb) {
+				if (query && query.cb) {
 					query.cb(null, error);
 					return;
 				}
@@ -16669,7 +16688,7 @@ alasql.from.CSV = function (contents, opts, cb, idx, query) {
 				return EOF;
 			}
 			if (eol) {
-				return (eol = false), EOL;
+				return ((eol = false), EOL);
 			}
 			var j = I;
 			if (text.charCodeAt(j) === quoteCode) {