alasql 4.2.3 → 4.2.4

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.2.2 build: develop-a55b6500 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.3 build: develop-aada421c | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.2.2
+@version 4.2.3
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '4.2.2';
-alasql.build = 'develop-a55b6500';
+alasql.version = '4.2.3';
+alasql.build = 'develop-aada421c';
 
 /**
 	Debug flag
@@ -5291,7 +5291,7 @@ yy.Statements = class Statements {
 					const res = statements.map(st => st(params));
 					if (cb) cb(res);
 					return res;
-			  };
+				};
 	}
 };
 /* global alasql */
@@ -6630,7 +6630,11 @@ function queryfn3(query) {
 
 				for (const key in query.groupColumns) {
 					// ony remove columns where the alias is also not a column in the result
-					if (query.groupColumns[key] !== key && d[query.groupColumns[key]] && !query.groupColumns[query.groupColumns[key]]){
+					if (
+						query.groupColumns[key] !== key &&
+						d[query.groupColumns[key]] &&
+						!query.groupColumns[query.groupColumns[key]]
+					) {
 						delete d[query.groupColumns[key]];
 					}
 				}
@@ -10223,14 +10227,6 @@ yy.Over = class Over {
 		return s;
 	}
 };
-/*
-//
-// Expressions for Alasql.js
-// Date: 03.11.2014
-// (c) 2014, Andrey Gershun
-//
-*/
-
 {
 	const assign = Object.assign;
 
@@ -10421,63 +10417,42 @@ yy.Over = class Over {
 		}
 	}
 
+	const toTypeNumberOps = new Set(['-', '*', '/', '%', '^']);
+	const toTypeStringOps = new Set(['||']);
+	const toTypeBoolOps = new Set([
+		'AND', 'OR', 'NOT', '=', '==', '===', '!=', '!==', '!===',
+		'>', '>=', '<', '<=', 'IN', 'NOT IN', 'LIKE', 'NOT LIKE',
+		'REGEXP', 'GLOB', 'BETWEEN', 'NOT BETWEEN', 'IS NULL', 'IS NOT NULL'
+	]);
 	class Op {
 		constructor(params) {
 			assign(this, params);
 		}
 
 		toString() {
+			const leftStr = this.left.toString();
+			let s;
+
 			if (this.op === 'IN' || this.op === 'NOT IN') {
-				return this.left.toString() + ' ' + this.op + ' (' + this.right.toString() + ')';
+				return `${leftStr} ${this.op} (${this.right.toString()})`;
 			}
+
 			if (this.allsome) {
-				return (
-					this.left.toString() +
-					' ' +
-					this.op +
-					' ' +
-					this.allsome +
-					' (' +
-					this.right.toString() +
-					')'
-				);
+				return `${leftStr} ${this.op} ${this.allsome} (${this.right.toString()})`;
 			}
-			if (this.op === '->' || this.op === '!') {
-				var s = this.left.toString() + this.op;
-
-				if (typeof this.right !== 'string' && typeof this.right !== 'number') {
-					s += '(';
-				}
-
-				s += this.right.toString();
-
-				if (typeof this.right !== 'string' && typeof this.right !== 'number') {
-					s += ')';
-				}
 
-				return s;
+			if (this.op === '->' || this.op === '!') {
+				s = `${leftStr}${this.op}`;
+				if (typeof this.right !== 'string' && typeof this.right !== 'number')
+					return s + `(${this.right.toString()})`;
+				return s + this.right.toString();
 			}
-			if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
-				var s =
-					this.left.toString() +
-					' ' +
-					this.op +
-					' ' +
-					this.right1.toString() +
-					' AND ' +
-					this.right2.toString();
 
-				return s;
+			if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
+				return `${leftStr} ${this.op} ${this.right1.toString()} AND ${this.right2.toString()}`;
 			}
 
-			return (
-				this.left.toString() +
-				' ' +
-				this.op +
-				' ' +
-				(this.allsome ? this.allsome + ' ' : '') +
-				this.right.toString()
-			);
+			return `${leftStr} ${this.op} ${this.allsome ? this.allsome + ' ' : ''}${this.right.toString()}`;
 		}
 
 		findAggregator(query) {
@@ -10491,65 +10466,29 @@ yy.Over = class Over {
 		}
 
 		toType(tableid) {
-			if (['-', '*', '/', '%', '^'].indexOf(this.op) > -1) {
+			if (toTypeNumberOps.has(this.op))
 				return 'number';
-			}
 
-			if (['||'].indexOf(this.op) > -1) {
+			if (toTypeStringOps.has(this.op))
 				return 'string';
-			}
 
 			if (this.op === '+') {
-				if (this.left.toType(tableid) === 'string' || this.right.toType(tableid) === 'string') {
+				const leftType = this.left.toType(tableid);
+				const rightType = this.right.toType(tableid);
+
+				if (leftType === 'string' || rightType === 'string') {
 					return 'string';
 				}
-				if (this.left.toType(tableid) === 'number' || this.right.toType(tableid) === 'number') {
+				if (leftType === 'number' || rightType === 'number') {
 					return 'number';
 				}
 			}
 
-			if (
-				[
-					'AND',
-					'OR',
-					'NOT',
-					'=',
-					'==',
-					'===',
-					'!=',
-					'!==',
-					'!===',
-					'>',
-					'>=',
-					'<',
-					'<=',
-					'IN',
-					'NOT IN',
-					'LIKE',
-					'NOT LIKE',
-					'REGEXP',
-					'GLOB',
-				].indexOf(this.op) > -1
-			) {
-				return 'boolean';
-			}
-
-			if (
-				this.op === 'BETWEEN' ||
-				this.op === 'NOT BETWEEN' ||
-				this.op === 'IS NULL' ||
-				this.op === 'IS NOT NULL'
-			) {
-				return 'boolean';
-			}
-
-			if (this.allsome) {
+			if (toTypeBoolOps.has(this.op) || this.allsome)
 				return 'boolean';
-			}
 
-			if (!this.op) {
-				return this.left.toType();
-			}
+			if (!this.op)
+				return this.left.toType(tableid);
 
 			return 'unknown';
 		}
@@ -10707,7 +10646,10 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
 				} else if (Array.isArray(this.right)) {
-					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+					if (
+						!alasql.options.cache ||
+						this.right.filter(value => value instanceof yy.ParamValue).length > 0
+					) {
 						// When not using cache, or when the array contains parameters, we need to re-create the Set
 						// leverage JS Set, which is faster for lookups than arrays
 						s =
@@ -10717,17 +10659,18 @@ yy.Over = class Over {
 							leftJS() +
 							')))';
 					} else {
-						// Use a cache to not re-create the Set on every identitical query 
+						// Use a cache to not re-create the Set on every identitical query
 						if (!alasql.sets) {
 							alasql.sets = {};
 						}
-						const allValues = this.right.map((value) => value.value);
-						const allValuesStr = allValues.join(",");
+						const allValues = this.right.map(value => value.value);
+						const allValuesStr = allValues.join(',');
 						if (!alasql.sets[allValuesStr]) {
 							// leverage JS Set, which is faster for lookups than arrays
 							alasql.sets[allValuesStr] = new Set(allValues);
 						}
-						s = 'alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
+						s =
+							'alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 					}
 				} else {
 					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
@@ -10744,7 +10687,10 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 				} else if (Array.isArray(this.right)) {
-					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+					if (
+						!alasql.options.cache ||
+						this.right.filter(value => value instanceof yy.ParamValue).length > 0
+					) {
 						// When not using cache, or when the array contains parameters, we need to re-create the Set
 						// leverage JS Set, which is faster for lookups than arrays
 						s =
@@ -10754,17 +10700,18 @@ yy.Over = class Over {
 							leftJS() +
 							'))))';
 					} else {
-						// Use a cache to not re-create the Set on every identitical query 
+						// Use a cache to not re-create the Set on every identitical query
 						if (!alasql.sets) {
 							alasql.sets = {};
 						}
-						const allValues = this.right.map((value) => value.value);
-						const allValuesStr = allValues.join(",");
+						const allValues = this.right.map(value => value.value);
+						const allValuesStr = allValues.join(',');
 						if (!alasql.sets[allValuesStr]) {
 							// leverage JS Set, which is faster for lookups than arrays
 							alasql.sets[allValuesStr] = new Set(allValues);
 						}
-						s = '!alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
+						s =
+							'!alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
 					}
 				} else {
 					s = '(' + rightJS() + '.indexOf(';
@@ -10831,13 +10778,6 @@ yy.Over = class Over {
 				op = '&&';
 			}
 
-			// if(this.op === '^') {
-			// 	// return 	'Math.pow('
-			// 	// 		+ leftJS()
-			// 	// 		+ ','
-			// 	// 		+ rightJS()
-			// 	// 		+ ')';
-			// }
 			var expr = s || '(' + leftJS() + op + rightJS() + ')';
 
 			var declareRefs = 'y=[(' + refs.join('), (') + ')]';
@@ -11001,38 +10941,33 @@ yy.Over = class Over {
 		}
 	}
 
+	const toJsOpMapping = {
+		'~': '~',
+		'-': '-',
+		'+': '+',
+		'NOT': '!',
+	};
+
 	class UniOp {
 		constructor(params) {
 			assign(this, params);
 		}
 
 		toString() {
-			var s;
 			const { op, right } = this;
 			const res = right.toString();
 
-			if (op === '~') {
-				s = op + res;
-			}
-			if (op === '-') {
-				s = op + res;
-			}
-			if (op === '+') {
-				s = op + res;
-			}
-			if (op === '#') {
-				s = op + res;
-			}
-			if (op === 'NOT') {
-				s = op + '(' + res + ')';
-			}
-			if (op === null) {
-				s = '(' + res + ')';
+			switch (op) {
+				case '~':
+				case '-':
+				case '+':
+				case '#':
+					return op + res;
+				case 'NOT':
+					return op + '(' + res + ')';
+				default:
+					return '(' + res + ')';
 			}
-			if (!s) {
-				s = '(' + res + ')';
-			}
-			return s;
 		}
 
 		findAggregator(query) {
@@ -11042,58 +10977,35 @@ yy.Over = class Over {
 		}
 
 		toType() {
-			if (this.op === '-') {
-				return 'number';
-			}
-
-			if (this.op === '+') {
-				return 'number';
-			}
-
-			if (this.op === 'NOT') {
-				return 'boolean';
+			switch (this.op) {
+				case '-':
+				case '+':
+					return 'number';
+				case 'NOT':
+					return 'boolean';
+				default:
+					return 'string';
 			}
-
-			// Todo: implement default case
 		}
 
 		toJS(context, tableid, defcols) {
-			if (this.op === '~') {
-				return '(~(' + this.right.toJS(context, tableid, defcols) + '))';
-			}
-
-			if (this.op === '-') {
-				return '(-(' + this.right.toJS(context, tableid, defcols) + '))';
+			if (this.right instanceof Column && this.op === '#') {
+				return `(alasql.databases[alasql.useid].objects['${this.right.columnid}'])`;
 			}
 
-			if (this.op === '+') {
-				return '(' + this.right.toJS(context, tableid, defcols) + ')';
-			}
+			const rightJS = this.right.toJS(context, tableid, defcols);
 
-			if (this.op === 'NOT') {
-				return '!(' + this.right.toJS(context, tableid, defcols) + ')';
+			if (toJsOpMapping.hasOwnProperty(this.op)) {
+				return `(${toJsOpMapping[this.op]}(${rightJS}))`;
 			}
 
-			if (this.op === '#') {
-				if (this.right instanceof Column) {
-					return "(alasql.databases[alasql.useid].objects['" + this.right.columnid + "'])";
-				} else {
-					return (
-						'(alasql.databases[alasql.useid].objects[' +
-						this.right.toJS(context, tableid, defcols) +
-						'])'
-					);
-				}
-			}
-
-			// Please avoid === here
 			if (this.op == null) {
-				// jshint ignore:line
-				return '(' + this.right.toJS(context, tableid, defcols) + ')';
+				return `(${rightJS})`;
 			}
 
-			// Todo: implement default case.
+			throw new Error(`Unsupported operator: ${this.op}`);
 		}
+
 	}
 
 	class Column {
@@ -11102,82 +11014,54 @@ yy.Over = class Over {
 		}
 
 		toString() {
-			var s;
+			let s = this.columnid;
+
 			if (this.columnid == +this.columnid) {
 				s = '[' + this.columnid + ']';
-			} else {
-				s = this.columnid;
 			}
+
 			if (this.tableid) {
-				if (+this.columnid === this.columnid) {
-					s = this.tableid + s;
-				} else {
-					s = this.tableid + '.' + s;
-				}
+				s = this.tableid + (this.columnid === +this.columnid ? '' : '.') + s;
+
 				if (this.databaseid) {
 					s = this.databaseid + '.' + s;
 				}
 			}
+
 			return s;
 		}
 
 		toJS(context, tableid, defcols) {
-			var s = '';
 			if (!this.tableid && tableid === '' && !defcols) {
-				if (this.columnid !== '_') {
-					s = context + "['" + this.columnid + "']";
-				} else {
-					if (context === 'g') {
-						s = "g['_']";
-					} else {
-						s = context;
-					}
-				}
-			} else {
-				if (context === 'g') {
-					s = "g['" + this.nick + "']";
-				} else if (this.tableid) {
-					if (this.columnid !== '_') {
-						s = context + "['" + this.tableid + "']['" + this.columnid + "']";
-					} else {
-						if (context === 'g') {
-							s = "g['_']";
-						} else {
-							s = context + "['" + this.tableid + "']";
-						}
-					}
-				} else if (defcols) {
-					var tbid = defcols[this.columnid];
-					if (tbid === '-') {
-						throw new Error(
-							'Cannot resolve column "' + this.columnid + '" because it exists in two source tables'
-						);
-					} else if (tbid) {
-						if (this.columnid !== '_') {
-							s = context + "['" + tbid + "']['" + this.columnid + "']";
-						} else {
-							s = context + "['" + tbid + "']";
-						}
+				return this.columnid !== '_' ? `${context}['${this.columnid}']` : (context === 'g' ? "g['_']" : context);
+			}
 
-					} else {
-						if (this.columnid !== '_') {
-							s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
-						} else {
-							s = context + "['" + (this.tableid || tableid) + "']";
-						}
-					}
-				} else if (tableid === -1) {
-					s = context + "['" + this.columnid + "']";
+			if (context === 'g') {
+				return `g['${this.nick}']`;
+			}
+
+			if (this.tableid) {
+				return this.columnid !== '_' ? `${context}['${this.tableid}']['${this.columnid}']` : (context === 'g' ? "g['_']" : `${context}['${this.tableid}']`);
+			}
+
+			if (defcols) {
+				const tbid = defcols[this.columnid];
+				if (tbid === '-') {
+					throw new Error(`Cannot resolve column "${this.columnid}" because it exists in two source tables`);
+				} else if (tbid) {
+					return this.columnid !== '_' ? `${context}['${tbid}']['${this.columnid}']` : `${context}['${tbid}']`;
 				} else {
-					if (this.columnid !== '_') {
-						s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
-					} else {
-						s = context + "['" + (this.tableid || tableid) + "']";
-					}
+					return this.columnid !== '_' ? `${context}['${this.tableid || tableid}']['${this.columnid}']` : `${context}['${this.tableid || tableid}']`;
 				}
 			}
-			return s;
+
+			if (tableid === -1) {
+				return `${context}['${this.columnid}']`;
+			}
+
+			return this.columnid !== '_' ? `${context}['${this.tableid || tableid}']['${this.columnid}']` : `${context}['${this.tableid || tableid}']`;
 		}
+
 	}
 
 	class AggrValue {
@@ -11186,68 +11070,37 @@ yy.Over = class Over {
 		}
 
 		toString() {
-			var s = '';
-			if (this.aggregatorid === 'REDUCE') {
-				s += this.funcid.replace(re_invalidFnNameChars, '') + '(';
-			} else {
-				s += this.aggregatorid + '(';
-			}
-
-			if (this.distinct) {
-				s += 'DISTINCT ';
-			}
-
-			if (this.expression) {
-				s += this.expression.toString();
-			}
-
-			s += ')';
+			const funcName = this.aggregatorid === 'REDUCE' ? this.funcid.replace(re_invalidFnNameChars, '') : this.aggregatorid;
+			const distinctPart = this.distinct ? 'DISTINCT ' : '';
+			const expressionPart = this.expression ? this.expression.toString() : '';
+			const overPart = this.over ? ` ${this.over.toString()}` : '';
 
-			if (this.over) {
-				s += ' ' + this.over.toString();
-			}
-			return s;
+			return `${funcName}(${distinctPart}${expressionPart})${overPart}`;
 		}
 
 		findAggregator(query) {
-			var colas = escapeq(this.toString()) + ':' + query.selectGroup.length;
-			var found = false;
-			if (!found) {
-				if (!this.nick) {
-					this.nick = colas;
-					var found = false;
-					for (var i = 0; i < query.removeKeys.length; i++) {
-						if (query.removeKeys[i] === colas) {
-							found = true;
-							break;
-						}
-					}
-					if (!found) {
-						query.removeKeys.push(colas);
-					}
+			const colas = escapeq(this.toString()) + ':' + query.selectGroup.length;
+
+			if (!this.nick) {
+				this.nick = colas;
+
+				if (!query.removeKeys.includes(colas)) {
+					query.removeKeys.push(colas);
 				}
-				query.selectGroup.push(this);
 			}
-			return;
+
+			query.selectGroup.push(this);
 		}
 
 		toType() {
-			if (
-				['SUM', 'COUNT', 'AVG', 'MIN', 'MAX', 'AGGR', 'VAR', 'STDDEV', 'TOTAL'].indexOf(
-					this.aggregatorid
-				) > -1
-			) {
+			if (['SUM', 'COUNT', 'AVG', 'MIN', 'MAX', 'AGGR', 'VAR', 'STDDEV', 'TOTAL'].includes(this.aggregatorid)) {
 				return 'number';
 			}
 
-			if (['ARRAY'].indexOf(this.aggregatorid) > -1) {
+			if (this.aggregatorid === 'ARRAY') {
 				return 'array';
 			}
 
-			if (['FIRST', 'LAST'].indexOf(this.aggregatorid) > -1) {
-				return this.expression.toType();
-			}
-
 			return this.expression.toType();
 		}
 
@@ -12277,51 +12130,60 @@ alasql.stdfn.CONVERT = function (value, args) {
 		}
 	}
 
-	if (args.dbtypeid == 'Date') {
-		return t;
-	} else if (udbtypeid == 'DATE') {
-		return s.formattedYear + '.' + s.formattedMonth + '.' + s.formattedDate;
-	} else if (udbtypeid == 'DATETIME' || udbtypeid == 'DATETIME2') {
-		var f = s.fullYear + '.' + s.formattedMonth + '.' + s.formattedDate;
-		f += ' ' + s.formattedHour + ':' + s.formattedMinutes + ':' + s.formattedSeconds;
-		f += '.' + s.formattedMilliseconds;
-		return f;
-	} else if (['MONEY'].indexOf(udbtypeid) > -1) {
-		var m = +val;
-		return (m | 0) + ((m * 100) % 100) / 100;
-	} else if (['BOOLEAN'].indexOf(udbtypeid) > -1) {
-		return !!val;
-	} else if (
-		['INT', 'INTEGER', 'SMALLINT', 'BIGINT', 'SERIAL', 'SMALLSERIAL', 'BIGSERIAL'].indexOf(
-			args.dbtypeid.toUpperCase()
-		) > -1
-	) {
-		return val | 0;
-	} else if (
-		['STRING', 'VARCHAR', 'NVARCHAR', 'CHARACTER VARIABLE'].indexOf(args.dbtypeid.toUpperCase()) >
-		-1
-	) {
-		if (args.dbsize) return ('' + val).substr(0, args.dbsize);
-		else return '' + val;
-	} else if (['CHAR', 'CHARACTER', 'NCHAR'].indexOf(udbtypeid) > -1) {
-		return (val + new Array(args.dbsize + 1).join(' ')).substr(0, args.dbsize);
-		//else return ""+val.substr(0,1);
-	} else if (['NUMBER', 'FLOAT', 'DECIMAL', 'NUMERIC'].indexOf(udbtypeid) > -1) {
-		var m = +val;
-		//toPrecision sets the number of numbers total in the result
-		m = args.dbsize !== undefined ? parseFloat(m.toPrecision(args.dbsize)) : m;
-		//toFixed sets the number of numbers to the right of the decimal
-		m = args.dbprecision !== undefined ? parseFloat(m.toFixed(args.dbprecision)) : m;
-		return m;
-	} else if (['JSON'].indexOf(udbtypeid) > -1) {
-		if (typeof val == 'object') return val;
-		try {
-			return JSON.parse(val);
-		} catch (err) {
-			throw new Error('Cannot convert string to JSON');
-		}
+	switch (udbtypeid) {
+		case 'DATE':
+			return `${s.formattedYear}.${s.formattedMonth}.${s.formattedDate}`;
+		case 'DATETIME':
+		case 'DATETIME2':
+			return `${s.fullYear}.${s.formattedMonth}.${s.formattedDate} ${s.formattedHour}:${s.formattedMinutes}:${s.formattedSeconds}.${s.formattedMilliseconds}`;
+		case 'MONEY':
+			var m = +val;
+			return (m | 0) + ((m * 100) % 100) / 100;
+		case 'BOOLEAN':
+			return !!val;
+		case 'INT':
+		case 'INTEGER':
+		case 'SMALLINT':
+		case 'BIGINT':
+		case 'SERIAL':
+		case 'SMALLSERIAL':
+		case 'BIGSERIAL':
+			return val | 0;
+		case 'STRING':
+		case 'VARCHAR':
+		case 'NVARCHAR':
+		case 'CHARACTER VARIABLE':
+			return args.dbsize ? String(val).substr(0, args.dbsize) : String(val);
+		case 'CHAR':
+		case 'CHARACTER':
+		case 'NCHAR':
+			return (val + ' '.repeat(args.dbsize)).substr(0, args.dbsize);
+		case 'NUMBER':
+		case 'FLOAT':
+		case 'DECIMAL':
+		case 'NUMERIC':
+			var m = +val;
+			if (args.dbsize !== undefined) {
+				m = parseFloat(m.toPrecision(args.dbsize));
+			}
+			if (args.dbprecision !== undefined) {
+				m = parseFloat(m.toFixed(args.dbprecision));
+			}
+			return m;
+		case 'JSON':
+			if (typeof val === 'object') {
+				return val;
+			}
+			try {
+				return JSON.parse(val);
+			} catch (err) {
+				throw new Error('Cannot convert string to JSON');
+			}
+		case 'Date':
+			return val;
+		default:
+			return val;
 	}
-	return val;
 };
 /*
 //