alasql 2.2.4 → 2.3.0

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.2.3-develop-21117291 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.2.5-develop-63c84c04 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.2.3-develop-21117291
+@version 2.2.5-develop-63c84c04
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -63,7 +63,7 @@ SOFTWARE.
 /**
 	AlaSQL - Main Alasql class
  	@function
- 	@param {string|function|object} sql - SQL-statement or data object for fuent interface
+ 	@param {string|function|object} sql - SQL-statement or data object for fluent interface
  	@param {object} params - SQL parameters
  	@param {function} cb - callback function
  	@param {object} scope - Scope for nested queries
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '2.2.3-develop-21117291';
+alasql.version = '2.2.5-develop-63c84c04';
 
 /**
 	Debug flag
@@ -151,7 +151,7 @@ alasql.version = '2.2.3-develop-21117291';
 alasql.debug = undefined; // Initial debug variable
 
 //*only-for-browser/*
-var require = function(){return null}; // as alasqlparser.js is generated, we can not "remove" referenses to 
+var require = function(){return null}; // as alasqlparser.js is generated, we can not "remove" references to 
 var __dirname = '';
 //*/
 
@@ -3484,19 +3484,7 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 			});
 		} else {
 			if (/^[a-z]+:\/\//i.test(path)) {
-				var fetch = require('node-fetch');
-				fetch(path)
-					.then((response) => response.arrayBuffer())
-					.then((buf) => {
-						var a = new Uint8Array(buf);
-						var b = [...a].map((e) => String.fromCharCode(e)).join('');
-						success(cutbom(b));
-					})
-					.catch((e) => {
-						if (error) return error(e);
-						console.error(e);
-						throw e;
-					});
+				fetchData(path, (x) => success(cutbom(x)), error, asy);
 			} else {
 				//If async callthen call async
 				if (asy) {
@@ -3559,21 +3547,7 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 					 Simply read file from HTTP request, like:
 					 SELECT * FROM TXT('http://alasql.org/README.md');
 				 */
-				var xhr = new XMLHttpRequest();
-				xhr.onreadystatechange = function () {
-					if (xhr.readyState === 4) {
-						if (xhr.status === 200) {
-							if (success) {
-								success(cutbom(xhr.responseText));
-							}
-						} else if (error) {
-							return error(xhr);
-						}
-						// Todo: else...?
-					}
-				};
-				xhr.open('GET', path, asy); // Async
-				xhr.send();
+				fetchData(path, (x) => success(cutbom(x)), error, asy);
 			}
 		} else if (path instanceof Event) {
 			/*
@@ -3600,6 +3574,33 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 	}
 });
 
+let _fetch = typeof fetch !== 'undefined' ? fetch : null;
+/*not-for-browser/*
+_fetch = typeof fetch !== 'undefined' ? fetch : require('cross-fetch');
+//*/
+
+async function fetchData(path, success, error, async) {
+	if (async) {
+		return getData(path, success, error);
+	}
+	return await getData(path, success, error);
+}
+
+function getData(path, success, error) {
+	return _fetch(path)
+		.then((response) => response.arrayBuffer())
+		.then((buf) => {
+			var a = new Uint8Array(buf);
+			var b = [...a].map((e) => String.fromCharCode(e)).join('');
+			success(b);
+		})
+		.catch((e) => {
+			if (error) return error(e);
+			console.error(e);
+			throw e;
+		});
+}
+
 /**
   @function Load binary file from anywhere
   @param {string} path File path
@@ -3625,19 +3626,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (
 		fs = require('fs');
 
 		if (/^[a-z]+:\/\//i.test(path)) {
-			var fetch = require('node-fetch');
-			fetch(path)
-				.then((response) => response.arrayBuffer())
-				.then((buf) => {
-					var a = new Uint8Array(buf);
-					var b = [...a].map((e) => String.fromCharCode(e)).join('');
-					success(b);
-				})
-				.catch((e) => {
-					if (error) return error(e);
-					console.error(e);
-					throw e;
-				});
+			fetchData(path, success, error, runAsync);
 		} else {
 			if (runAsync) {
 				fs.readFile(path, function (err, data) {
@@ -3870,30 +3859,14 @@ var saveFile = (utils.saveFile = function (path, data, cb, opts) {
 			//                });
 			//            });
 		} else {
-			if (isIE() === 9) {
-				// Solution was taken from
-				// http://megatuto.com/formation-JAVASCRIPT.php?JAVASCRIPT_Example=Javascript+Save+CSV+file+in+IE+8/IE+9+without+using+window.open()+Categorie+javascript+internet-explorer-8&category=&article=7993
-				//				var URI = 'data:text/plain;charset=utf-8,';
-
-				// Prepare data
-				var ndata = data.replace(/\r\n/g, '&#A;&#D;');
-				ndata = ndata.replace(/\n/g, '&#D;');
-				ndata = ndata.replace(/\t/g, '	');
-				var testlink = utils.global.open('about:blank', '_blank');
-				testlink.document.write(ndata); //fileData has contents for the file
-				testlink.document.close();
-				testlink.document.execCommand('SaveAs', false, path);
-				testlink.close();
-			} else {
-				var opt = {
-					disableAutoBom: false,
-				};
-				alasql.utils.extend(opt, opts);
-				var blob = new Blob([data], {type: 'text/plain;charset=utf-8'});
-				saveAs(blob, path, opt.disableAutoBom);
-				if (cb) {
-					res = cb(res);
-				}
+			var opt = {
+				disableAutoBom: false,
+			};
+			alasql.utils.extend(opt, opts);
+			var blob = new Blob([data], {type: 'text/plain;charset=utf-8'});
+			saveAs(blob, path, opt.disableAutoBom);
+			if (cb) {
+				res = cb(res);
 			}
 		}
 	}
@@ -3901,17 +3874,6 @@ var saveFile = (utils.saveFile = function (path, data, cb, opts) {
 	return res;
 });
 
-/**
-  @function Is this IE9
-  @return {boolean} True for IE9 and false for other browsers
-
-  For IE9 compatibility issues
-  */
-function isIE() {
-	var myNav = navigator.userAgent.toLowerCase();
-	return myNav.indexOf('msie') !== -1 ? parseInt(myNav.split('msie')[1]) : false;
-}
-
 /**
   @function Hash a string to signed integer
   @param {string} source string
@@ -4054,7 +4016,7 @@ var cloneDeep = (utils.cloneDeep = function cloneDeep(obj) {
 		return +obj;
 	}
 
-	var temp = obj.constructor(); // changed
+	var temp = new obj.constructor(); // changed
 
 	for (var key in obj) {
 		if (obj.hasOwnProperty(key)) {
@@ -6551,7 +6513,7 @@ function queryfn3(query) {
 
 	doJoin(query, scope, h);
 
-	// If groupping, then filter groups with HAVING function
+	// If grouping, then filter groups with HAVING function
 
 	if (query.groupfn) {
 		query.data = [];
@@ -7036,7 +6998,7 @@ function doJoin(query, scope, h) {
 
 			//			var res = query.selectfn(scope, query.params, alasql);
 
-			// If there is a GROUP BY then pipe to groupping function
+			// If there is a GROUP BY then pipe to grouping function
 			if (query.groupfn) {
 				query.groupfn(scope, query.params, alasql);
 			} else {
@@ -8619,7 +8581,7 @@ yy.Select.prototype.compileGroup = function (query) {
 			var coljs = col2.split('\t')[1];
 			// Check, if aggregator exists but GROUP BY is not exists
 			if (columnid === '') {
-				return '1'; // Create fictive groupping column for fictive GROUP BY
+				return '1'; // Create fictive grouping column for fictive GROUP BY
 			}
 			//			else return "r['"+columnid+"']";
 			query.ingroup.push(columnid);
@@ -9538,6 +9500,11 @@ yy.Select.prototype.compileOrder = function (query, params) {
 		this.order.forEach(function (ord, idx) {
 
 			if (ord.expression instanceof yy.NumValue) {
+				if (ord.expression.value > self.columns.length) {
+					throw new Error(
+						`You are trying to order by column number ${ord.expression.value} but you have only selected ${self.columns.length} columns.`
+					);
+				}
 				var v = self.columns[ord.expression.value - 1];
 			} else {
 				var v = ord.expression;
@@ -10157,416 +10124,402 @@ yy.Over.prototype.toString = function () {
 //
 */
 
-var assign = Object.assign;
+{
+	const assign = Object.assign;
 
-/**
-		Expression statement ( = 2*2; )
-		@class
-	@param {object} params Initial parameters
-*/
-yy.ExpressionStatement = function (params) {
-	return assign(this, params);
-};
+	class ExpressionStatement {
+		/** @param {object} params Initial parameters */
+		constructor(params) {
+			assign(this, params);
+		}
 
-/**
-	Convert AST to string
-	@this ExpressionStatement
-	@return {string}
-*/
-yy.ExpressionStatement.prototype.toString = function () {
-	return this.expression.toString();
-};
-/**
-	Execute statement
-	@param {string} databaseid Database identificatro
-	@param {object} params Statement parameters
-	@param {statement-callback} cb Callback
-	@return {object} Result value
-*/
-yy.ExpressionStatement.prototype.execute = function (databaseid, params, cb) {
-	if (this.expression) {
+		/**
+			Convert AST to string
+			@return {string}
+		*/
+		toString() {
+			return this.expression.toString();
+		}
 
-		alasql.precompile(this, databaseid, params); // Precompile queries
-		var exprfn = new Function(
-			'params,alasql,p',
-			'var y;return ' + this.expression.toJS('({})', '', null)
-		).bind(this);
-		var res = exprfn(params, alasql);
-		if (cb) {
-			res = cb(res);
+		/**
+			Execute statement
+			@param {string} databaseid Database identificatro
+			@param {object} params Statement parameters
+			@param {statement-callback} cb Callback
+			@return {object} Result value
+		*/
+		execute(databaseid, params, cb) {
+			if (this.expression) {
+
+				alasql.precompile(this, databaseid, params); // Precompile queries
+				var exprfn = new Function(
+					'params,alasql,p',
+					'var y;return ' + this.expression.toJS('({})', '', null)
+				).bind(this);
+				var res = exprfn(params, alasql);
+				if (cb) {
+					res = cb(res);
+				}
+				return res;
+			}
 		}
-		return res;
 	}
-};
 
-/**
-	Expression class
-	@class
-	@param {object} params Initial parameters
-*/
+	class Expression {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.Expression = function (params) {
-	return assign(this, params);
-};
+		/**
+			Convert AST to string
+			@return {string}
+		*/
+		toString() {
+			var s = this.expression.toString();
+			if (this.order) {
+				s += ' ' + this.order.toString();
+			}
+			if (this.nocase) {
+				s += ' COLLATE NOCASE';
+			}
+			if (this.direction) {
+				s += ' ' + this.direction;
+			}
+			return s;
+		}
 
-/**
-	Convert AST to string
-	@this ExpressionStatement
-	@return {string}
-*/
-yy.Expression.prototype.toString = function () {
-	var s = this.expression.toString();
-	if (this.order) {
-		s += ' ' + this.order.toString();
-	}
-	if (this.nocase) {
-		s += ' COLLATE NOCASE';
-	}
-	if (this.direction) {
-		s += ' ' + this.direction;
-	}
-	return s;
-};
+		/**
+			Find aggregator in AST subtree
+			@param {object} query Query object
+		*/
+		findAggregator(query) {
+			if (this.expression.findAggregator) {
+				this.expression.findAggregator(query);
+			}
+		}
 
-/**
-	Find aggregator in AST subtree
-	@this ExpressionStatement
-	@param {object} query Query object
-*/
-yy.Expression.prototype.findAggregator = function (query) {
-	if (this.expression.findAggregator) {
-		this.expression.findAggregator(query);
-	}
-};
+		/**
+			Convert AST to JavaScript expression
+			@param {string} context Context string, e.g. 'p','g', or 'x'
+			@param {string} tableid Default table name
+			@param {object} defcols Default columns dictionary
+			@return {string} JavaScript expression
+		*/
+		toJS(context, tableid, defcols) {
 
-/**
-	Convert AST to JavaScript expression
-	@this ExpressionStatement
-	@param {string} context Context string, e.g. 'p','g', or 'x'
-	@param {string} tableid Default table name
-	@param {object} defcols Default columns dictionary
-	@return {string} JavaScript expression
-*/
+			if (this.expression.reduced) {
+				return 'true';
+			}
+			return this.expression.toJS(context, tableid, defcols);
+		}
 
-yy.Expression.prototype.toJS = function (context, tableid, defcols) {
+		/**
+			Compile AST to JavaScript expression
+			@param {string} context Context string, e.g. 'p','g', or 'x'
+			@param {string} tableid Default table name
+			@param {object} defcols Default columns dictionary
+			@return {string} JavaScript expression
+		*/
+		compile(context, tableid, defcols) {
 
-	if (this.expression.reduced) {
-		return 'true';
+			if (this.reduced) {
+				return returnTrue();
+			}
+			return new Function('p', 'var y;return ' + this.toJS(context, tableid, defcols));
+		}
 	}
-	return this.expression.toJS(context, tableid, defcols);
-};
-
-/**
-	Compile AST to JavaScript expression
-	@this ExpressionStatement
-	@param {string} context Context string, e.g. 'p','g', or 'x'
-	@param {string} tableid Default table name
-	@param {object} defcols Default columns dictionary
-	@return {string} JavaScript expression
-*/
 
-yy.Expression.prototype.compile = function (context, tableid, defcols) {
+	class JavaScript {
+		constructor(params) {
+			assign(this, params);
+		}
 
-	if (this.reduced) {
-		return returnTrue();
-	}
-	return new Function('p', 'var y;return ' + this.toJS(context, tableid, defcols));
-};
+		toString() {
+			var s = '``' + this.value + '``';
+			return s;
+		}
 
-/**
-	JavaScript class
-	@class
-*/
-yy.JavaScript = function (params) {
-	return assign(this, params);
-};
-yy.JavaScript.prototype.toString = function () {
-	var s = '``' + this.value + '``';
-	return s;
-};
+		toJS() {
+			return '(' + this.value + ')';
+		}
 
-yy.JavaScript.prototype.toJS = function () {
-	return '(' + this.value + ')';
-};
-yy.JavaScript.prototype.execute = function (databaseid, params, cb) {
-	var res = 1;
-	var expr = new Function('params,alasql,p', this.value);
-	expr(params, alasql);
-	if (cb) {
-		res = cb(res);
+		execute(databaseid, params, cb) {
+			var res = 1;
+			var expr = new Function('params,alasql,p', this.value);
+			expr(params, alasql);
+			if (cb) {
+				res = cb(res);
+			}
+			return res;
+		}
 	}
-	return res;
-};
 
-/**
-	Literal class
-	@class
-	@example
-	MyVar, [My vairable], `MySQL variable`
-*/
+	class Literal {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.Literal = function (params) {
-	return assign(this, params);
-};
-yy.Literal.prototype.toString = function () {
-	var s = this.value;
-	if (this.value1) {
-		s = this.value1 + '.' + s;
+		toString() {
+			var s = this.value;
+			if (this.value1) {
+				s = this.value1 + '.' + s;
+			}
+			//	else s = tableid+'.'+s;
+			return s;
+		}
 	}
-	//	else s = tableid+'.'+s;
-	return s;
-};
 
-/**
-	Join class
-	@class
-*/
+	class Join {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.Join = function (params) {
-	return assign(this, params);
-};
-yy.Join.prototype.toString = function () {
-	var s = ' ';
-	if (this.joinmode) {
-		s += this.joinmode + ' ';
+		toString() {
+			var s = ' ';
+			if (this.joinmode) {
+				s += this.joinmode + ' ';
+			}
+			s += 'JOIN ' + this.table.toString();
+			return s;
+		}
 	}
-	s += 'JOIN ' + this.table.toString();
-	return s;
-};
 
-/**
-	Table class
-	@class
-*/
+	class Table {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.Table = function (params) {
-	return assign(this, params);
-};
-yy.Table.prototype.toString = function () {
-	var s = this.tableid;
-	//	if(this.joinmode)
-	if (this.databaseid) {
-		s = this.databaseid + '.' + s;
+		toString() {
+			var s = this.tableid;
+			//	if(this.joinmode)
+			if (this.databaseid) {
+				s = this.databaseid + '.' + s;
+			}
+			return s;
+		}
 	}
-	return s;
-};
-
-/**
-	View class
-	@class
-*/
 
-yy.View = function (params) {
-	return assign(this, params);
-};
-yy.View.prototype.toString = function () {
-	var s = this.viewid;
-	//	if(this.joinmode)
-	if (this.databaseid) {
-		s = this.databaseid + '.' + s;
-	}
-	return s;
-};
+	class View {
+		constructor(params) {
+			assign(this, params);
+		}
 
-/**
-	Binary operation class
-	@class
-*/
-yy.Op = function (params) {
-	return assign(this, params);
-};
-yy.Op.prototype.toString = function () {
-	if (this.op === 'IN' || this.op === 'NOT IN') {
-		return this.left.toString() + ' ' + this.op + ' (' + this.right.toString() + ')';
-	}
-	if (this.allsome) {
-		return (
-			this.left.toString() + ' ' + this.op + ' ' + this.allsome + ' (' + this.right.toString() + ')'
-		);
+		toString() {
+			var s = this.viewid;
+			//	if(this.joinmode)
+			if (this.databaseid) {
+				s = this.databaseid + '.' + s;
+			}
+			return s;
+		}
 	}
-	if (this.op === '->' || this.op === '!') {
-		var s = this.left.toString() + this.op;
 
-		if (typeof this.right !== 'string' && typeof this.right !== 'number') {
-			s += '(';
+	class Op {
+		constructor(params) {
+			assign(this, params);
 		}
 
-		s += this.right.toString();
+		toString() {
+			if (this.op === 'IN' || this.op === 'NOT IN') {
+				return this.left.toString() + ' ' + this.op + ' (' + this.right.toString() + ')';
+			}
+			if (this.allsome) {
+				return (
+					this.left.toString() +
+					' ' +
+					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 += ')';
-		}
+				if (typeof this.right !== 'string' && typeof this.right !== 'number') {
+					s += '(';
+				}
 
-		return s;
-	}
-	if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
-		var s =
-			this.left.toString() +
-			' ' +
-			this.op +
-			' ' +
-			this.right1.toString() +
-			' AND ' +
-			this.right2.toString();
+				s += this.right.toString();
 
-		return s;
-	}
+				if (typeof this.right !== 'string' && typeof this.right !== 'number') {
+					s += ')';
+				}
 
-	return (
-		this.left.toString() +
-		' ' +
-		this.op +
-		' ' +
-		(this.allsome ? this.allsome + ' ' : '') +
-		this.right.toString()
-	);
-};
+				return s;
+			}
+			if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
+				var s =
+					this.left.toString() +
+					' ' +
+					this.op +
+					' ' +
+					this.right1.toString() +
+					' AND ' +
+					this.right2.toString();
 
-yy.Op.prototype.findAggregator = function (query) {
-	if (this.left && this.left.findAggregator) {
-		this.left.findAggregator(query);
-	}
-	// Do not go in > ALL
-	if (this.right && this.right.findAggregator && !this.allsome) {
-		this.right.findAggregator(query);
-	}
-};
+				return s;
+			}
 
-yy.Op.prototype.toType = function (tableid) {
-	if (['-', '*', '/', '%', '^'].indexOf(this.op) > -1) {
-		return 'number';
-	}
-	if (['||'].indexOf(this.op) > -1) {
-		return 'string';
-	}
-	if (this.op === '+') {
-		if (this.left.toType(tableid) === 'string' || this.right.toType(tableid) === 'string') {
-			return 'string';
+			return (
+				this.left.toString() +
+				' ' +
+				this.op +
+				' ' +
+				(this.allsome ? this.allsome + ' ' : '') +
+				this.right.toString()
+			);
 		}
-		if (this.left.toType(tableid) === 'number' || this.right.toType(tableid) === 'number') {
-			return 'number';
+
+		findAggregator(query) {
+			if (this.left && this.left.findAggregator) {
+				this.left.findAggregator(query);
+			}
+			// Do not go in > ALL
+			if (this.right && this.right.findAggregator && !this.allsome) {
+				this.right.findAggregator(query);
+			}
 		}
-	}
 
-	if (
-		[
-			'AND',
-			'OR',
-			'NOT',
-			'=',
-			'==',
-			'===',
-			'!=',
-			'!==',
-			'!===',
-			'>',
-			'>=',
-			'<',
-			'<=',
-			'IN',
-			'NOT IN',
-			'LIKE',
-			'NOT LIKE',
-			'REGEXP',
-			'GLOB',
-		].indexOf(this.op) > -1
-	) {
-		return 'boolean';
-	}
+		toType(tableid) {
+			if (['-', '*', '/', '%', '^'].indexOf(this.op) > -1) {
+				return 'number';
+			}
 
-	if (
-		this.op === 'BETWEEN' ||
-		this.op === 'NOT BETWEEN' ||
-		this.op === 'IS NULL' ||
-		this.op === 'IS NOT NULL'
-	) {
-		return 'boolean';
-	}
+			if (['||'].indexOf(this.op) > -1) {
+				return 'string';
+			}
 
-	if (this.allsome) {
-		return 'boolean';
-	}
+			if (this.op === '+') {
+				if (this.left.toType(tableid) === 'string' || this.right.toType(tableid) === 'string') {
+					return 'string';
+				}
+				if (this.left.toType(tableid) === 'number' || this.right.toType(tableid) === 'number') {
+					return 'number';
+				}
+			}
 
-	if (!this.op) {
-		return this.left.toType();
-	}
+			if (
+				[
+					'AND',
+					'OR',
+					'NOT',
+					'=',
+					'==',
+					'===',
+					'!=',
+					'!==',
+					'!===',
+					'>',
+					'>=',
+					'<',
+					'<=',
+					'IN',
+					'NOT IN',
+					'LIKE',
+					'NOT LIKE',
+					'REGEXP',
+					'GLOB',
+				].indexOf(this.op) > -1
+			) {
+				return 'boolean';
+			}
 
-	return 'unknown';
-};
+			if (
+				this.op === 'BETWEEN' ||
+				this.op === 'NOT BETWEEN' ||
+				this.op === 'IS NULL' ||
+				this.op === 'IS NOT NULL'
+			) {
+				return 'boolean';
+			}
 
-yy.Op.prototype.toJS = function (context, tableid, defcols) {
+			if (this.allsome) {
+				return 'boolean';
+			}
 
-	var s;
-	var refs = [];
-	var op = this.op;
-	var _this = this;
-	//var leftJS = function(){return _this.left.toJS(context,tableid, defcols)};
-	//var rightJS = function(){return _this.right.toJS(context,tableid, defcols)};
-	var accessedLeft = false,
-		accessedRight = false;
-	var ref = function (expr) {
-		if (expr.toJS) {
-			expr = expr.toJS(context, tableid, defcols);
-		}
-		var i = refs.push(expr) - 1;
-		return 'y[' + i + ']';
-	};
-	var leftJS = function () {
-		return ref(_this.left);
-	};
-	var rightJS = function () {
-		return ref(_this.right);
-	};
+			if (!this.op) {
+				return this.left.toType();
+			}
 
-	if (this.op === '=') {
-		op = '===';
-	} else if (this.op === '<>') {
-		op = '!=';
-	} else if (this.op === 'OR') {
-		op = '||';
-	}
+			return 'unknown';
+		}
 
-	// Arrow operator
-	if (this.op === '->') {
-		// Expression to prevent error if object is empty (#344)
-		var ljs = '(' + leftJS() + '||{})';
+		toJS(context, tableid, defcols) {
 
-		if (typeof this.right === 'string') {
-			s = ljs + '["' + this.right + '"]';
-		} else if (typeof this.right === 'number') {
-			s = ljs + '[' + this.right + ']';
-		} else if (this.right instanceof yy.FuncValue) {
-			var ss = [];
-			if (!(!this.right.args || 0 === this.right.args.length)) {
-				var ss = this.right.args.map(ref);
+			var s;
+			var refs = [];
+			var op = this.op;
+			var _this = this;
+			//var leftJS = function(){return _this.left.toJS(context,tableid, defcols)};
+			//var rightJS = function(){return _this.right.toJS(context,tableid, defcols)};
+			var accessedLeft = false,
+				accessedRight = false;
+			var ref = function (expr) {
+				if (expr.toJS) {
+					expr = expr.toJS(context, tableid, defcols);
+				}
+				var i = refs.push(expr) - 1;
+				return 'y[' + i + ']';
+			};
+			var leftJS = function () {
+				return ref(_this.left);
+			};
+			var rightJS = function () {
+				return ref(_this.right);
+			};
+
+			if (this.op === '=') {
+				op = '===';
+			} else if (this.op === '<>') {
+				op = '!=';
+			} else if (this.op === 'OR') {
+				op = '||';
 			}
-			s = '' + ljs + '[' + JSON.stringify(this.right.funcid) + '](' + ss.join(',') + ')';
-		} else {
-			s = '' + ljs + '[' + rightJS() + ']';
-		}
-	}
 
-	if (this.op === '!') {
-		if (typeof this.right === 'string') {
-			s = '' + 'alasql.databases[alasql.useid].objects[' + leftJS() + ']["' + this.right + '"]';
-		}
-		// TODO - add other cases
-	}
+			// Arrow operator
+			if (this.op === '->') {
+				// Expression to prevent error if object is empty (#344)
+				var ljs = '(' + leftJS() + '||{})';
+
+				if (typeof this.right === 'string') {
+					s = ljs + '["' + this.right + '"]';
+				} else if (typeof this.right === 'number') {
+					s = ljs + '[' + this.right + ']';
+				} else if (this.right instanceof yy.FuncValue) {
+					var ss = [];
+					if (!(!this.right.args || 0 === this.right.args.length)) {
+						var ss = this.right.args.map(ref);
+					}
+					s = '' + ljs + '[' + JSON.stringify(this.right.funcid) + '](' + ss.join(',') + ')';
+				} else {
+					s = '' + ljs + '[' + rightJS() + ']';
+				}
+			}
 
-	if (this.op === 'IS') {
-		const leftOperand = leftJS();
-		const rightOperand = rightJS();
-		if (
-			this.right instanceof yy.NullValue ||
-			(this.right.op === 'NOT' && this.right.right instanceof yy.NullValue)
-		) {
-			s = `(
+			if (this.op === '!') {
+				if (typeof this.right === 'string') {
+					s = '' + 'alasql.databases[alasql.useid].objects[' + leftJS() + ']["' + this.right + '"]';
+				}
+				// TODO - add other cases
+			}
+
+			if (this.op === 'IS') {
+				const leftOperand = leftJS();
+				const rightOperand = rightJS();
+				if (
+					this.right instanceof yy.NullValue ||
+					(this.right.op === 'NOT' && this.right.right instanceof yy.NullValue)
+				) {
+					s = `(
 					(${leftOperand}==null)   // Cant be ===
 					===
 					(${rightOperand}==null)  // Cant be ===
 				)`;
-		} else {
-			s = `(
+				} else {
+					s = `(
 					(${leftOperand} == ${rightOperand})
 					||
 					(
@@ -10575,572 +10528,650 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 						true == ${rightOperand}
 					)
 				)`;
-		}
-	}
+				}
+			}
 
-	if (this.op === '==') {
-		s = '' + 'alasql.utils.deepEqual(' + leftJS() + ',' + rightJS() + ')';
-	}
+			if (this.op === '==') {
+				s = '' + 'alasql.utils.deepEqual(' + leftJS() + ',' + rightJS() + ')';
+			}
 
-	if (this.op === '===' || this.op === '!===') {
-		s =
-			'' +
-			'(' +
-			(this.op === '!===' ? '!' : '') +
-			'(' +
-			'(' +
-			leftJS() +
-			').valueOf()' +
-			'===' +
-			'(' +
-			rightJS() +
-			').valueOf()' +
-			')' +
-			')';
-	}
+			if (this.op === '===' || this.op === '!===') {
+				s =
+					'' +
+					'(' +
+					(this.op === '!===' ? '!' : '') +
+					'(' +
+					'(' +
+					leftJS() +
+					').valueOf()' +
+					'===' +
+					'(' +
+					rightJS() +
+					').valueOf()' +
+					')' +
+					')';
+			}
 
-	if (this.op === '!==') {
-		s = '' + '(!alasql.utils.deepEqual(' + leftJS() + ',' + rightJS() + '))';
-	}
-	if (this.op === '||') {
-		s = '' + "(''+(" + leftJS() + "||'')+(" + rightJS() + '||""))';
-	}
-	if (this.op === 'LIKE' || this.op === 'NOT LIKE') {
-		var s =
-			'(' + (this.op === 'NOT LIKE' ? '!' : '') + 'alasql.utils.like(' + rightJS() + ',' + leftJS();
-		if (this.escape) {
-			s += ',' + ref(this.escape);
-		}
-		s += '))';
-	}
-	if (this.op === 'REGEXP') {
-		s = 'alasql.stdfn.REGEXP_LIKE(' + leftJS() + ',' + rightJS() + ')';
-	}
-	if (this.op === 'GLOB') {
-		s = 'alasql.utils.glob(' + leftJS() + ',' + rightJS() + ')';
-	}
+			if (this.op === '!==') {
+				s = '' + '(!alasql.utils.deepEqual(' + leftJS() + ',' + rightJS() + '))';
+			}
+			if (this.op === '||') {
+				s = '' + "(''+(" + leftJS() + "||'')+(" + rightJS() + '||""))';
+			}
+			if (this.op === 'LIKE' || this.op === 'NOT LIKE') {
+				var s =
+					'(' +
+					(this.op === 'NOT LIKE' ? '!' : '') +
+					'alasql.utils.like(' +
+					rightJS() +
+					',' +
+					leftJS();
+				if (this.escape) {
+					s += ',' + ref(this.escape);
+				}
+				s += '))';
+			}
+			if (this.op === 'REGEXP') {
+				s = 'alasql.stdfn.REGEXP_LIKE(' + leftJS() + ',' + rightJS() + ')';
+			}
+			if (this.op === 'GLOB') {
+				s = 'alasql.utils.glob(' + leftJS() + ',' + rightJS() + ')';
+			}
 
-	if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
-		var left = leftJS();
-		s =
-			'' +
-			'(' +
-			(this.op === 'NOT BETWEEN' ? '!' : '') +
-			'(' +
-			'(' +
-			ref(this.right1) +
-			'<=' +
-			left +
-			') && (' +
-			left +
-			'<=' +
-			ref(this.right2) +
-			')' +
-			')' +
-			')';
-	}
+			if (this.op === 'BETWEEN' || this.op === 'NOT BETWEEN') {
+				var left = leftJS();
+				s =
+					'' +
+					'(' +
+					(this.op === 'NOT BETWEEN' ? '!' : '') +
+					'(' +
+					'(' +
+					ref(this.right1) +
+					'<=' +
+					left +
+					') && (' +
+					left +
+					'<=' +
+					ref(this.right2) +
+					')' +
+					')' +
+					')';
+			}
 
-	if (this.op === 'IN') {
-		if (this.right instanceof yy.Select) {
-			s = '(';
-			//			s += 'this.query.queriesdata['+this.queriesidx+']';
-			//			s += 'alasql.utils.flatArray(this.query.queriesfn['+(this.queriesidx)+'](params,null,context))';
-			s +=
-				'alasql.utils.flatArray(this.queriesfn[' +
-				this.queriesidx +
-				'](params,null,' +
-				context +
-				'))';
-			s += '.indexOf(';
-			s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
-		} else if (Array.isArray(this.right)) {
-			//			if(this.right.length == 0) return 'false';
-			s =
-				'([' +
-				this.right.map(ref).join(',') +
-				'].indexOf(alasql.utils.getValueOf(' +
-				leftJS() +
-				'))>-1)';
+			if (this.op === 'IN') {
+				if (this.right instanceof yy.Select) {
+					s = '(';
+					//			s += 'this.query.queriesdata['+this.queriesidx+']';
+					//			s += 'alasql.utils.flatArray(this.query.queriesfn['+(this.queriesidx)+'](params,null,context))';
+					s +=
+						'alasql.utils.flatArray(this.queriesfn[' +
+						this.queriesidx +
+						'](params,null,' +
+						context +
+						'))';
+					s += '.indexOf(';
+					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
+				} else if (Array.isArray(this.right)) {
+					//			if(this.right.length == 0) return 'false';
+					s =
+						'([' +
+						this.right.map(ref).join(',') +
+						'].indexOf(alasql.utils.getValueOf(' +
+						leftJS() +
+						'))>-1)';
 
-		} else {
-			s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
+				} else {
+					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
 
-			//		} else {
-			//			throw new Error('Wrong IN operator without SELECT part');
-		}
-	}
+					//		} else {
+					//			throw new Error('Wrong IN operator without SELECT part');
+				}
+			}
 
-	if (this.op === 'NOT IN') {
-		if (this.right instanceof yy.Select) {
-			s = '(';
-			s += 'alasql.utils.flatArray(this.queriesfn[' + this.queriesidx + '](params,null,p))';
-			s += '.indexOf(';
-			s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
-		} else if (Array.isArray(this.right)) {
-			s = '([' + this.right.map(ref).join(',') + '].indexOf(';
-			s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
-		} else {
-			s = '(' + rightJS() + '.indexOf(';
-			s += leftJS() + ')==-1)';
+			if (this.op === 'NOT IN') {
+				if (this.right instanceof yy.Select) {
+					s = '(';
+					s += 'alasql.utils.flatArray(this.queriesfn[' + this.queriesidx + '](params,null,p))';
+					s += '.indexOf(';
+					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
+				} else if (Array.isArray(this.right)) {
+					s = '([' + this.right.map(ref).join(',') + '].indexOf(';
+					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
+				} else {
+					s = '(' + rightJS() + '.indexOf(';
+					s += leftJS() + ')==-1)';
+
+					//			throw new Error('Wrong NOT IN operator without SELECT part');
+				}
+			}
+
+			if (this.allsome === 'ALL') {
+				var s;
+				if (this.right instanceof yy.Select) {
+					s =
+						'alasql.utils.flatArray(this.query.queriesfn[' + this.queriesidx + '](params,null,p))';
+
+					s += '.every(function(b){return (';
+					s += leftJS() + ')' + op + 'b})';
+				} else if (Array.isArray(this.right)) {
+					s =
+						'' +
+						(this.right.length == 1
+							? ref(this.right[0])
+							: '[' + this.right.map(ref).join(',') + ']');
+					s += '.every(function(b){return (';
+					s += leftJS() + ')' + op + 'b})';
+				} else {
+					throw new Error('NOT IN operator without SELECT');
+				}
+			}
+
+			if (this.allsome === 'SOME' || this.allsome === 'ANY') {
+				var s;
+				if (this.right instanceof yy.Select) {
+					s =
+						'alasql.utils.flatArray(this.query.queriesfn[' + this.queriesidx + '](params,null,p))';
+					s += '.some(function(b){return (';
+					s += leftJS() + ')' + op + 'b})';
+				} else if (Array.isArray(this.right)) {
+					s =
+						'' +
+						(this.right.length == 1
+							? ref(this.right[0])
+							: '[' + this.right.map(ref).join(',') + ']');
+					s += '.some(function(b){return (';
+					s += leftJS() + ')' + op + 'b})';
+				} else {
+					throw new Error('SOME/ANY operator without SELECT');
+				}
+			}
+
+			// Special case for AND optimization (if reduced)
+			if (this.op === 'AND') {
+				if (this.left.reduced) {
+					if (this.right.reduced) {
+						return 'true';
+					} else {
+						s = rightJS();
+					}
+				} else if (this.right.reduced) {
+					s = leftJS();
+				}
 
-			//			throw new Error('Wrong NOT IN operator without SELECT part');
+				// Otherwise process as regular operation (see below)
+				op = '&&';
+			}
+
+			// if(this.op === '^') {
+			// 	// return 	'Math.pow('
+			// 	// 		+ leftJS()
+			// 	// 		+ ','
+			// 	// 		+ rightJS()
+			// 	// 		+ ')';
+			// }
+			var expr = s || '(' + leftJS() + op + rightJS() + ')';
+
+			var declareRefs = 'y=[(' + refs.join('), (') + ')]';
+			if (op === '&&' || op === '||' || op === 'IS' || op === 'IS NULL' || op === 'IS NOT NULL') {
+				return '(' + declareRefs + ', ' + expr + ')';
+			}
+
+			return (
+				'(' + declareRefs + ', ' + 'y.some(function(e){return e == null}) ? void 0 : ' + expr + ')'
+			);
 		}
 	}
 
-	if (this.allsome === 'ALL') {
-		var s;
-		if (this.right instanceof yy.Select) {
-			s = 'alasql.utils.flatArray(this.query.queriesfn[' + this.queriesidx + '](params,null,p))';
+	class VarValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-			s += '.every(function(b){return (';
-			s += leftJS() + ')' + op + 'b})';
-		} else if (Array.isArray(this.right)) {
-			s =
-				'' +
-				(this.right.length == 1 ? ref(this.right[0]) : '[' + this.right.map(ref).join(',') + ']');
-			s += '.every(function(b){return (';
-			s += leftJS() + ')' + op + 'b})';
-		} else {
-			throw new Error('NOT IN operator without SELECT');
-		}
-	}
-
-	if (this.allsome === 'SOME' || this.allsome === 'ANY') {
-		var s;
-		if (this.right instanceof yy.Select) {
-			s = 'alasql.utils.flatArray(this.query.queriesfn[' + this.queriesidx + '](params,null,p))';
-			s += '.some(function(b){return (';
-			s += leftJS() + ')' + op + 'b})';
-		} else if (Array.isArray(this.right)) {
-			s =
-				'' +
-				(this.right.length == 1 ? ref(this.right[0]) : '[' + this.right.map(ref).join(',') + ']');
-			s += '.some(function(b){return (';
-			s += leftJS() + ')' + op + 'b})';
-		} else {
-			throw new Error('SOME/ANY operator without SELECT');
+		toString() {
+			return '@' + this.variable;
 		}
-	}
 
-	// Special case for AND optimization (if reduced)
-	if (this.op === 'AND') {
-		if (this.left.reduced) {
-			if (this.right.reduced) {
-				return 'true';
-			} else {
-				s = rightJS();
-			}
-		} else if (this.right.reduced) {
-			s = leftJS();
+		toType() {
+			return 'unknown';
 		}
 
-		// Otherwise process as regular operation (see below)
-		op = '&&';
+		toJS() {
+			return "alasql.vars['" + this.variable + "']";
+		}
 	}
 
-	// if(this.op === '^') {
-	// 	// return 	'Math.pow('
-	// 	// 		+ leftJS()
-	// 	// 		+ ','
-	// 	// 		+ rightJS()
-	// 	// 		+ ')';
-	// }
-
-	var expr = s || '(' + leftJS() + op + rightJS() + ')';
+	class NumValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-	var declareRefs = 'y=[(' + refs.join('), (') + ')]';
-	if (op === '&&' || op === '||' || op === 'IS' || op === 'IS NULL' || op === 'IS NOT NULL') {
-		return '(' + declareRefs + ', ' + expr + ')';
-	}
+		toString() {
+			return this.value.toString();
+		}
 
-	return (
-		'(' + declareRefs + ', ' + 'y.some(function(e){return e == null}) ? void 0 : ' + expr + ')'
-	);
-};
+		toType() {
+			return 'number';
+		}
 
-yy.VarValue = function (params) {
-	return assign(this, params);
-};
-yy.VarValue.prototype.toString = function () {
-	return '@' + this.variable;
-};
+		toJS() {
+			return '' + this.value;
+		}
+	}
 
-yy.VarValue.prototype.toType = function () {
-	return 'unknown';
-};
+	class StringValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.VarValue.prototype.toJS = function () {
-	return "alasql.vars['" + this.variable + "']";
-};
+		toString() {
+			return "'" + this.value.toString() + "'";
+		}
 
-yy.NumValue = function (params) {
-	return assign(this, params);
-};
-yy.NumValue.prototype.toString = function () {
-	return this.value.toString();
-};
+		toType() {
+			return 'string';
+		}
 
-yy.NumValue.prototype.toType = function () {
-	return 'number';
-};
+		toJS() {
+			return "'" + escapeq(this.value) + "'";
+		}
+	}
 
-yy.NumValue.prototype.toJS = function () {
-	return '' + this.value;
-};
+	class DomainValueValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.StringValue = function (params) {
-	return assign(this, params);
-};
-yy.StringValue.prototype.toString = function () {
-	return "'" + this.value.toString() + "'";
-};
+		toString() {
+			return 'VALUE';
+		}
 
-yy.StringValue.prototype.toType = function () {
-	return 'string';
-};
+		toType() {
+			return 'object';
+		}
 
-yy.StringValue.prototype.toJS = function () {
-	return "'" + escapeq(this.value) + "'";
-};
+		toJS(context, tableid, defcols) {
 
-yy.DomainValueValue = function (params) {
-	return assign(this, params);
-};
-yy.DomainValueValue.prototype.toString = function () {
-	return 'VALUE';
-};
+			//	return "'"+doubleqq(this.value)+"'";
+			return context;
+		}
+	}
 
-yy.DomainValueValue.prototype.toType = function () {
-	return 'object';
-};
+	class ArrayValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.DomainValueValue.prototype.toJS = function (context, tableid, defcols) {
+		toString() {
+			return 'ARRAY[]';
+		}
 
-	//	return "'"+doubleqq(this.value)+"'";
-	return context;
-};
+		toType() {
+			return 'object';
+		}
 
-yy.ArrayValue = function (params) {
-	return assign(this, params);
-};
-yy.ArrayValue.prototype.toString = function () {
-	return 'ARRAY[]';
-};
+		toJS(context, tableid, defcols) {
+			return (
+				'[(' +
+				this.value
+					.map(function (el) {
+						return el.toJS(context, tableid, defcols);
+					})
+					.join('), (') +
+				')]'
+			);
+		}
+	}
 
-yy.ArrayValue.prototype.toType = function () {
-	return 'object';
-};
+	class LogicValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.ArrayValue.prototype.toJS = function (context, tableid, defcols) {
-	return (
-		'[(' +
-		this.value
-			.map(function (el) {
-				return el.toJS(context, tableid, defcols);
-			})
-			.join('), (') +
-		')]'
-	);
-};
+		toString() {
+			return this.value ? 'TRUE' : 'FALSE';
+		}
 
-yy.LogicValue = function (params) {
-	return assign(this, params);
-};
-yy.LogicValue.prototype.toString = function () {
-	return this.value ? 'TRUE' : 'FALSE';
-};
+		toType() {
+			return 'boolean';
+		}
 
-yy.LogicValue.prototype.toType = function () {
-	return 'boolean';
-};
+		toJS() {
+			return this.value ? 'true' : 'false';
+		}
+	}
 
-yy.LogicValue.prototype.toJS = function () {
-	return this.value ? 'true' : 'false';
-};
+	class NullValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.NullValue = function (params) {
-	return assign(this, params);
-};
-yy.NullValue.prototype.toString = function () {
-	return 'NULL';
-};
-yy.NullValue.prototype.toJS = function () {
-	return 'undefined';
-	//	return 'undefined';
-};
+		toString() {
+			return 'NULL';
+		}
 
-yy.ParamValue = function (params) {
-	return assign(this, params);
-};
-yy.ParamValue.prototype.toString = function () {
-	return '$' + this.param;
-};
-yy.ParamValue.prototype.toJS = function () {
-	if (typeof this.param === 'string') {
-		return "params['" + this.param + "']";
+		toJS() {
+			return 'undefined';
+		}
 	}
 
-	return 'params[' + this.param + ']';
-};
+	class ParamValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.UniOp = function (params) {
-	return assign(this, params);
-};
-yy.UniOp.prototype.toString = function () {
-	var s;
-	s = void 0;
-	if (this.op === '~') {
-		s = this.op + this.right.toString();
-	}
-	if (this.op === '-') {
-		s = this.op + this.right.toString();
-	}
-	if (this.op === '+') {
-		s = this.op + this.right.toString();
-	}
-	if (this.op === '#') {
-		s = this.op + this.right.toString();
-	}
-	if (this.op === 'NOT') {
-		s = this.op + '(' + this.right.toString() + ')';
-	}
-	if (this.op === null) {
-		s = '(' + this.right.toString() + ')';
-	}
-	if (!s) {
-		s = '(' + this.right.toString() + ')';
-	}
-	return s;
-};
+		toString() {
+			return '$' + this.param;
+		}
 
-yy.UniOp.prototype.findAggregator = function (query) {
-	if (this.right.findAggregator) {
-		this.right.findAggregator(query);
-	}
-};
+		toJS() {
+			if (typeof this.param === 'string') {
+				return "params['" + this.param + "']";
+			}
 
-yy.UniOp.prototype.toType = function () {
-	if (this.op === '-') {
-		return 'number';
+			return 'params[' + this.param + ']';
+		}
 	}
 
-	if (this.op === '+') {
-		return 'number';
-	}
+	class UniOp {
+		constructor(params) {
+			assign(this, params);
+		}
 
-	if (this.op === 'NOT') {
-		return 'boolean';
-	}
+		toString() {
+			var s;
+			const {op, right} = this;
+			const res = right.toString();
 
-	// Todo: implement default case
-};
+			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 + ')';
+			}
+			if (!s) {
+				s = '(' + res + ')';
+			}
+			return s;
+		}
 
-yy.UniOp.prototype.toJS = function (context, tableid, defcols) {
-	if (this.op === '~') {
-		return '(~(' + this.right.toJS(context, tableid, defcols) + '))';
-	}
+		findAggregator(query) {
+			if (this.right.findAggregator) {
+				this.right.findAggregator(query);
+			}
+		}
 
-	if (this.op === '-') {
-		return '(-(' + this.right.toJS(context, tableid, defcols) + '))';
-	}
+		toType() {
+			if (this.op === '-') {
+				return 'number';
+			}
 
-	if (this.op === '+') {
-		return '(' + this.right.toJS(context, tableid, defcols) + ')';
-	}
+			if (this.op === '+') {
+				return 'number';
+			}
 
-	if (this.op === 'NOT') {
-		return '!(' + this.right.toJS(context, tableid, defcols) + ')';
-	}
+			if (this.op === 'NOT') {
+				return 'boolean';
+			}
 
-	if (this.op === '#') {
-		if (this.right instanceof yy.Column) {
-			return "(alasql.databases[alasql.useid].objects['" + this.right.columnid + "'])";
-		} else {
-			return (
-				'(alasql.databases[alasql.useid].objects[' +
-				this.right.toJS(context, tableid, defcols) +
-				'])'
-			);
+			// Todo: implement default case
 		}
-	}
 
-	// Please avoid === here
-	if (this.op == null) {
-		// jshint ignore:line
-		return '(' + this.right.toJS(context, tableid, defcols) + ')';
-	}
+		toJS(context, tableid, defcols) {
+			if (this.op === '~') {
+				return '(~(' + this.right.toJS(context, tableid, defcols) + '))';
+			}
 
-	// Todo: implement default case.
-};
+			if (this.op === '-') {
+				return '(-(' + this.right.toJS(context, tableid, defcols) + '))';
+			}
 
-yy.Column = function (params) {
-	return assign(this, params);
-};
-yy.Column.prototype.toString = function () {
-	var s;
-	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;
-		}
-		if (this.databaseid) {
-			s = this.databaseid + '.' + s;
+			if (this.op === '+') {
+				return '(' + this.right.toJS(context, tableid, defcols) + ')';
+			}
+
+			if (this.op === 'NOT') {
+				return '!(' + this.right.toJS(context, tableid, defcols) + ')';
+			}
+
+			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) + ')';
+			}
+
+			// Todo: implement default case.
 		}
 	}
-	return s;
-};
 
-yy.Column.prototype.toJS = function (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;
-			}
+	class Column {
+		constructor(params) {
+			assign(this, params);
 		}
-	} else {
-		if (context === 'g') {
-			s = "g['" + this.nick + "']";
-		} else if (this.tableid) {
-			if (this.columnid !== '_') {
-				s = context + "['" + this.tableid + "']['" + this.columnid + "']";
+
+		toString() {
+			var s;
+			if (this.columnid == +this.columnid) {
+				s = '[' + this.columnid + ']';
 			} else {
-				if (context === 'g') {
-					s = "g['_']";
+				s = this.columnid;
+			}
+			if (this.tableid) {
+				if (+this.columnid === this.columnid) {
+					s = this.tableid + s;
 				} else {
-					s = context + "['" + this.tableid + "']";
+					s = this.tableid + '.' + s;
+				}
+				if (this.databaseid) {
+					s = this.databaseid + '.' + s;
 				}
 			}
-		} 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) {
+			return s;
+		}
+
+		toJS(context, tableid, defcols) {
+			var s = '';
+			if (!this.tableid && tableid === '' && !defcols) {
 				if (this.columnid !== '_') {
-					s = context + "['" + tbid + "']['" + this.columnid + "']";
+					s = context + "['" + this.columnid + "']";
 				} else {
-					s = context + "['" + tbid + "']";
+					if (context === 'g') {
+						s = "g['_']";
+					} else {
+						s = context;
+					}
 				}
-
 			} else {
-				if (this.columnid !== '_') {
-					s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
+				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 + "']";
+						}
+
+					} 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 + "']";
 				} else {
-					s = context + "['" + (this.tableid || tableid) + "']";
+					if (this.columnid !== '_') {
+						s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
+					} else {
+						s = context + "['" + (this.tableid || tableid) + "']";
+					}
 				}
 			}
-		} else if (tableid === -1) {
-			s = context + "['" + this.columnid + "']";
-		} else {
-			if (this.columnid !== '_') {
-				s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
-			} else {
-				s = context + "['" + (this.tableid || tableid) + "']";
-			}
+			return s;
 		}
 	}
-	return s;
-};
 
-yy.AggrValue = function (params) {
-	return assign(this, params);
-};
-yy.AggrValue.prototype.toString = function () {
-	var s = '';
-	if (this.aggregatorid === 'REDUCE') {
-		s += this.funcid.replace(re_invalidFnNameChars, '') + '(';
-	} else {
-		s += this.aggregatorid + '(';
-	}
+	class AggrValue {
+		constructor(params) {
+			assign(this, params);
+		}
 
-	if (this.distinct) {
-		s += 'DISTINCT ';
-	}
+		toString() {
+			var s = '';
+			if (this.aggregatorid === 'REDUCE') {
+				s += this.funcid.replace(re_invalidFnNameChars, '') + '(';
+			} else {
+				s += this.aggregatorid + '(';
+			}
 
-	if (this.expression) {
-		s += this.expression.toString();
-	}
+			if (this.distinct) {
+				s += 'DISTINCT ';
+			}
 
-	s += ')';
+			if (this.expression) {
+				s += this.expression.toString();
+			}
 
-	if (this.over) {
-		s += ' ' + this.over.toString();
-	}
-	return s;
-};
+			s += ')';
 
-yy.AggrValue.prototype.findAggregator = function (query) {
-	var colas = escapeq(this.toString()) + ':' + query.selectGroup.length;
-	var found = false;
-	if (!found) {
-		if (!this.nick) {
-			this.nick = colas;
+			if (this.over) {
+				s += ' ' + this.over.toString();
+			}
+			return s;
+		}
+
+		findAggregator(query) {
+			var colas = escapeq(this.toString()) + ':' + query.selectGroup.length;
 			var found = false;
-			for (var i = 0; i < query.removeKeys.length; i++) {
-				if (query.removeKeys[i] === colas) {
-					found = true;
-					break;
+			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);
+					}
 				}
+				query.selectGroup.push(this);
 			}
-			if (!found) {
-				query.removeKeys.push(colas);
+			return;
+		}
+
+		toType() {
+			if (
+				['SUM', 'COUNT', 'AVG', 'MIN', 'MAX', 'AGGR', 'VAR', 'STDDEV'].indexOf(this.aggregatorid) >
+				-1
+			) {
+				return 'number';
 			}
+
+			if (['ARRAY'].indexOf(this.aggregatorid) > -1) {
+				return 'array';
+			}
+
+			if (['FIRST', 'LAST'].indexOf(this.aggregatorid) > -1) {
+				return this.expression.toType();
+			}
+
+			return this.expression.toType();
 		}
-		query.selectGroup.push(this);
-	}
-	return;
-};
 
-yy.AggrValue.prototype.toType = function () {
-	if (
-		['SUM', 'COUNT', 'AVG', 'MIN', 'MAX', 'AGGR', 'VAR', 'STDDEV'].indexOf(this.aggregatorid) > -1
-	) {
-		return 'number';
+		toJS() {
+			var colas = this.nick;
+			if (colas === undefined) {
+				colas = this.toString();
+			}
+			return "g['" + colas + "']";
+		}
 	}
 
-	if (['ARRAY'].indexOf(this.aggregatorid) > -1) {
-		return 'array';
+	class OrderExpression {
+		constructor(params) {
+			assign(this, params);
+		}
 	}
 
-	if (['FIRST', 'LAST'].indexOf(this.aggregatorid) > -1) {
-		return this.expression.toType();
-	}
+	OrderExpression.prototype.toString = Expression.prototype.toString;
 
-	return this.expression.toType();
-};
+	class GroupExpression {
+		constructor(params) {
+			assign(this, params);
+		}
 
-yy.AggrValue.prototype.toJS = function () {
-	var colas = this.nick;
-	if (colas === undefined) {
-		colas = this.toString();
+		toString() {
+			return this.type + '(' + this.group.toString() + ')';
+		}
 	}
-	return "g['" + colas + "']";
-};
-
-yy.OrderExpression = function (params) {
-	return assign(this, params);
-};
-
-yy.OrderExpression.prototype.toString = yy.Expression.prototype.toString;
 
-yy.GroupExpression = function (params) {
-	return assign(this, params);
-};
-yy.GroupExpression.prototype.toString = function () {
-	return this.type + '(' + this.group.toString() + ')';
-};
+	assign(yy, {
+		AggrValue,
+		ArrayValue,
+		Column,
+		DomainValueValue,
+		Expression,
+		ExpressionStatement,
+		GroupExpression,
+		JavaScript,
+		Join,
+		Literal,
+		LogicValue,
+		NullValue,
+		NumValue,
+		Op,
+		OrderExpression,
+		ParamValue,
+		StringValue,
+		Table,
+		UniOp,
+		VarValue,
+		View,
+	});
+}
 
 // Alasql Linq library
 
@@ -11320,9 +11351,9 @@ yy.FuncValue = function (params) {
 	return Object.assign(this, params);
 };
 
-var re_invalidFnNameChars = /[^0-9A-Z_$]+/i;
+let re_invalidFnNameChars = /[^0-9A-Z_$]+/i;
 yy.FuncValue.prototype.toString = function () {
-	var s = '';
+	let s = '';
 
 	if (alasql.fn[this.funcid]) s += this.funcid;
 	else if (alasql.aggr[this.funcid]) s += this.funcid;
@@ -11344,10 +11375,10 @@ yy.FuncValue.prototype.toString = function () {
 };
 
 yy.FuncValue.prototype.execute = function (databaseid, params, cb) {
-	var res = 1;
+	let res = 1;
 	alasql.precompile(this, databaseid, params); // Precompile queries
 
-	var expr = new Function('params,alasql', 'var y;return ' + this.toJS('', '', null));
+	let expr = new Function('params,alasql', 'var y;return ' + this.toJS('', '', null));
 	expr(params, alasql);
 	if (cb) res = cb(res);
 	return res;
@@ -11426,7 +11457,7 @@ stdlib.EXP = function (a) {
 };
 
 stdlib.IIF = function (a, b, c) {
-	if (arguments.length == 3) {
+	if (arguments.length === 3) {
 		return '((' + a + ')?(' + b + '):(' + c + '))';
 	} else {
 		throw new Error('Number of arguments of IFF is not equals to 3');
@@ -16925,16 +16956,7 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 				//				saveAs(new Blob([s2ab(wbout)],{type:"application/octet-stream"}), '"'+filename+'"')
 				//				saveAs(new Blob([s2ab(wbout)],{type:"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}), filename)
 				//				saveAs(new Blob([s2ab(wbout)],{type:"application/vnd.ms-excel"}), '"'+filename+'"');
-				if (isIE() == 9) {
-					throw new Error('Cannot save XLSX files in IE9. Please use XLS() export function');
-					//					var URI = 'data:text/plain;charset=utf-8,';
-
-					/** @todo Check if this code is required */
-
-					//					alert('ie9');
-				} else {
-					saveAs(new Blob([s2ab(wbout)], {type: 'application/octet-stream'}), filename);
-				}
+				saveAs(new Blob([s2ab(wbout)], {type: 'application/octet-stream'}), filename);
 			}
 		}