alasql 4.2.6 → 4.2.7

package/dist/alasql.js

@@ -1,15 +1,15 @@
-//! AlaSQL v4.2.5 build: develop-40f8e9c3 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.6 build: develop-6db74fcc | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.2.5
+@version 4.2.6
 
 AlaSQL - JavaScript SQL database
-© 2014-2023	Andrey Gershun & Mathias Wulff
+© 2014-2024	Andrey Gershun & Mathias Wulff
 
 @license
 The MIT License (MIT)
 
-Copyright 2014-2023 Andrey Gershun (agershun@gmail.com) & Mathias Wulff (m@rawu.dk)
+Copyright 2014-2024 Andrey Gershun (agershun@gmail.com) & Mathias Wulff (m@rawu.dk)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -49,109 +49,109 @@ SOFTWARE.
 */
 
 (function (root, factory) {
-    if (typeof define === 'function' && define.amd) {
-        define([], factory);
-    } else if (typeof exports === 'object') {
-    	/** alasql main function */
-        module.exports = factory();
-    } else {
-        root.alasql = factory();
-    }
+	if (typeof define === 'function' && define.amd) {
+		define([], factory);
+	} else if (typeof exports === 'object') {
+		/** alasql main function */
+		module.exports = factory();
+	} else {
+		root.alasql = factory();
+	}
 }(this, function () {
 
-/**
-	AlaSQL - Main Alasql class
- 	@function
- 	@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
- 	@return {any} - Result data object
-
-	@example
- Standard sync call:
-    alasql('CREATE TABLE one');
- Query:
- 	var res = alasql('SELECT * FROM one');
- Call with parameters:
- 	var res = alasql('SELECT * FROM ?',[data]);
- Standard async call with callback function:
- 	alasql('SELECT * FROM ?',[data],function(res){
-		console.log(data);
- 	});
- Call with scope for subquery (to pass common values):
-    var scope = {one:{a:2,b;20}}
-    alasql('SELECT * FROM ? two WHERE two.a = one.a',[data],null,scope);
- Call for fluent interface with data object:
-    alasql(data).Where(function(x){return x.a == 10}).exec();
- Call for fluent interface without data object:
-    alasql().From(data).Where(function(x){return x.a == 10}).exec();
- */
+	/**
+		AlaSQL - Main Alasql class
+		  @function
+		  @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
+		  @return {any} - Result data object
+
+		@example
+	 Standard sync call:
+		alasql('CREATE TABLE one');
+	 Query:
+		  var res = alasql('SELECT * FROM one');
+	 Call with parameters:
+		  var res = alasql('SELECT * FROM ?',[data]);
+	 Standard async call with callback function:
+		  alasql('SELECT * FROM ?',[data],function(res){
+			console.log(data);
+		  });
+	 Call with scope for subquery (to pass common values):
+		var scope = {one:{a:2,b;20}}
+		alasql('SELECT * FROM ? two WHERE two.a = one.a',[data],null,scope);
+	 Call for fluent interface with data object:
+		alasql(data).Where(function(x){return x.a == 10}).exec();
+	 Call for fluent interface without data object:
+		alasql().From(data).Where(function(x){return x.a == 10}).exec();
+	 */
 
-var alasql = function(sql, params, cb, scope) {
+	let alasql = function (sql, params, cb, scope) {
 
-	params = params||[];
+		params = params || [];
 
-	if(typeof importScripts !== 'function' && alasql.webworker) {
-		var id = alasql.lastid++;
-		alasql.buffer[id] = cb;
-		alasql.webworker.postMessage({id:id,sql:sql,params:params});
-		return;
-	} 
+		if (typeof importScripts !== 'function' && alasql.webworker) {
+			var id = alasql.lastid++;
+			alasql.buffer[id] = cb;
+			alasql.webworker.postMessage({ id: id, sql: sql, params: params });
+			return;
+		}
 
-	if(arguments.length === 0) {
-		// Without arguments - Fluent interface
-		return new yy.Select({
-			columns:[new yy.Column({columnid:'*'})],
-			from: [new yy.ParamValue({param:0})]
-		});
-	} else if(arguments.length === 1){ 
-		// Access promise notation without using `.promise(...)`
-		if(sql.constructor === Array){
-			return alasql.promise(sql);
+		if (arguments.length === 0) {
+			// Without arguments - Fluent interface
+			return new yy.Select({
+				columns: [new yy.Column({ columnid: '*' })],
+				from: [new yy.ParamValue({ param: 0 })]
+			});
+		} else if (arguments.length === 1) {
+			// Access promise notation without using `.promise(...)`
+			if (sql.constructor === Array) {
+				return alasql.promise(sql);
+			}
+		}
+		// Avoid setting params if not needed even with callback
+		if (typeof params === 'function') {
+			scope = cb;
+			cb = params;
+			params = [];
 		}
-	} 
-	// Avoid setting params if not needed even with callback
-	if(typeof params === 'function'){
-		scope = cb;
-		cb = params;
-		params = [];
-	}
 
-	if(typeof params !== 'object'){
+		if (typeof params !== 'object') {
 			params = [params];
-	}
+		}
 
-	// Standard interface
-	// alasql('#sql');
-	if(typeof sql === 'string' && sql[0]==='#' && typeof document === "object") {
-		sql = document.querySelector(sql).textContent;
-	} else if(typeof sql === 'object' && sql instanceof HTMLElement) {
-		sql = sql.textContent;
-	} else if(typeof sql === 'function') {
-		// to run multiline functions
-		sql = sql.toString();
-		sql = (/\/\*([\S\s]+)\*\//m.exec(sql) || ['','Function given as SQL. Plese Provide SQL string or have a /* ... */ syle comment with SQL in the function.'])[1];	
-	}
-	// Run SQL			
-	return alasql.exec(sql, params, cb, scope);
-};
+		// Standard interface
+		// alasql('#sql');
+		if (typeof sql === 'string' && sql[0] === '#' && typeof document === "object") {
+			sql = document.querySelector(sql).textContent;
+		} else if (typeof sql === 'object' && sql instanceof HTMLElement) {
+			sql = sql.textContent;
+		} else if (typeof sql === 'function') {
+			// to run multiline functions
+			sql = sql.toString();
+			sql = (/\/\*([\S\s]+)\*\//m.exec(sql) || ['', 'Function given as SQL. Plese Provide SQL string or have a /* ... */ syle comment with SQL in the function.'])[1];
+		}
+		// Run SQL
+		return alasql.exec(sql, params, cb, scope);
+	};
 
-/** 
-	Current version of alasql 
- 	@constant {string} 
-*/
-alasql.version = '4.2.5';
-alasql.build = 'develop-40f8e9c3';
+	/**
+		Current version of alasql
+		  @constant {string}
+	*/
+	alasql.version = '4.2.6';
+	alasql.build = 'develop-6db74fcc';
 
-/**
-	Debug flag
-	@type {boolean}
-*/
-alasql.debug = undefined; // Initial debug variable
+	/**
+		Debug flag
+		@type {boolean}
+	*/
+	alasql.debug = undefined; // Initial debug variable
 
 //*only-for-browser/*
-var require = function(){return null}; // as alasqlparser.js is generated, we can not "remove" references to 
+var require = function(){return null}; // as alasqlparser.js is generated, we can not "remove" references to
 var __dirname = '';
 //*/
 /* parser generated by jison 0.4.18 */
@@ -3144,7 +3144,7 @@ if (typeof module !== 'undefined' && require.main === module) {
 */
 
 /**
- 	Pretty flag - nice HTML output or standard text without any tags
+	  Pretty flag - nice HTML output or standard text without any tags
 	@type {boolean}
 */
 
@@ -3155,7 +3155,7 @@ alasql.prettyflag = false;
 	@function
 	@param {string} sql SQL statement
 	@param {boolean} flag value
-	@return {string} HTML or text string with pretty output 
+	@return {string} HTML or text string with pretty output
 */
 
 alasql.pretty = function (sql, flag) {
@@ -3165,7 +3165,6 @@ alasql.pretty = function (sql, flag) {
 	alasql.prettyflag = pf;
 	return s;
 };
-
 /*jshint unused:false*/
 /*
 	Utilities for Alasql.js
@@ -3455,6 +3454,7 @@ utils.hasIndexedDB = (function () {
 utils.isArray = function (obj) {
 	return '[object Array]' === Object.prototype.toString.call(obj);
 };
+
 /**
   Load text file from anywhere
   @param {string|object} path File path or HTML event
@@ -3466,7 +3466,9 @@ utils.isArray = function (obj) {
   @todo Define Event type
   @todo Smaller if-else structures.
   */
-var loadFile = (utils.loadFile = function (path, asy, success, error) {
+
+const protocolRegex = /^[a-z]+:\/\//i;
+let loadFile = (utils.loadFile = function (path, asy, success, error) {
 	var data, fs;
 	if (utils.isNode || utils.isMeteorServer) {
 		/*not-for-browser/*
@@ -3485,30 +3487,38 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 			process.stdin.on('end', function () {
 				success(cutbom(buff));
 			});
-		} else {
-			if (/^[a-z]+:\/\//i.test(path)) {
-				fetchData(path, x => success(cutbom(x)), error, asy);
-			} else {
-				//If async callthen call async
-				if (asy) {
-					fs.readFile(path, function (err, data) {
-						if (err) {
-							return error(err, null);
-						}
-						success(cutbom(data.toString()));
-					});
-				} else {
-					// Call sync version
-					try {
-						data = fs.readFileSync(path);
-					} catch (e) {
-						return error(err, null);
-					}
-					success(cutbom(data.toString()));
+			return;
+		}
+
+		if (protocolRegex.test(path)) {
+			fetchData(path, x => success(cutbom(x)), error, asy);
+			return;
+		}
+
+		//If async callthen call async
+		if (asy) {
+			fs.readFile(path, function (err, data) {
+				if (err) {
+					return error(err, null);
 				}
-			}
+				success(cutbom(data.toString()));
+			});
+			return;
 		}
-	} else if (utils.isReactNative) {
+
+		// Call sync version
+		try {
+			data = fs.readFileSync(path);
+		} catch (e) {
+			error(err, null);
+			return;
+		}
+
+		success(cutbom(data.toString()));
+		return;
+	}
+
+	if (utils.isReactNative) {
 		// If ReactNative
 		var RNFS = require('react-native-fs');
 		RNFS.readFile(path, 'utf8')
@@ -3519,7 +3529,10 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 				return error(err, null);
 			});
 		//*/
-	} else if (utils.isCordova) {
+		return;
+	}
+
+	if (utils.isCordova) {
 		/* If Cordova */
 		utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
 			fileSystem.root.getFile(path, {create: false}, function (fileEntry) {
@@ -3533,48 +3546,52 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 			});
 		});
 
-		/** @todo Check eliminated code below */
+		return;
+	}
 
-	} else {
-		/* For string */
-		if (typeof path === 'string') {
-			// For browser read from tag
-			/*
-				 SELECT * FROM TXT('#one') -- read data from HTML element with id="one"
-			 */
-			if (path.substr(0, 1) === '#' && typeof document !== 'undefined') {
-				data = document.querySelector(path).textContent;
-				success(data);
-			} else {
-				/*
-					 Simply read file from HTTP request, like:
-					 SELECT * FROM TXT('http://alasql.org/README.md');
-				 */
-				fetchData(path, x => success(cutbom(x)), error, asy);
-			}
-		} else if (path instanceof Event) {
-			/*
-				 For browser read from files input element
-				 <input type="files" onchange="readFile(event)">
-				 <script>
-					 function readFile(event) {
-						 alasql('SELECT * FROM TXT(?)',[event])
-					 }
-				 </script>
-			 */
-			/** @type {array} List of files from <input> element */
-			var files = path.target.files;
-			/** type {object} */
-			var reader = new FileReader();
-			/** type {string} */
-			var name = files[0].name;
-			reader.onload = function (e) {
-				var data = e.target.result;
-				success(cutbom(data));
-			};
-			reader.readAsText(files[0]);
+	/* For string */
+	if (typeof path === 'string') {
+		// For browser read from tag
+		/*
+			 SELECT * FROM TXT('#one') -- read data from HTML element with id="one"
+		 */
+		if (path.substr(0, 1) === '#' && typeof document !== 'undefined') {
+			data = document.querySelector(path).textContent;
+			success(data);
+			return;
 		}
+
+		/*
+			 Simply read file from HTTP request, like:
+			 SELECT * FROM TXT('http://alasql.org/README.md');
+		 */
+		fetchData(path, x => success(cutbom(x)), error, asy);
+		return;
+	}
+
+	if (path instanceof Event) {
+		/*
+			 For browser read from files input element
+			 <input type="files" onchange="readFile(event)">
+			 <script>
+				 function readFile(event) {
+					 alasql('SELECT * FROM TXT(?)',[event])
+				 }
+			 </script>
+		 */
+		/** @type {array} List of files from <input> element */
+		var files = path.target.files;
+		/** type {object} */
+		var reader = new FileReader();
+		/** type {string} */
+		var name = files[0].name;
+		reader.onload = function (e) {
+			var data = e.target.result;
+			success(cutbom(data));
+		};
+		reader.readAsText(files[0]);
 	}
+	fetchData(path, x => success(cutbom(x)), error, asy);
 });
 
 let _fetch = typeof fetch !== 'undefined' ? fetch : null;
@@ -4340,15 +4357,15 @@ var getXLSX = function () {
 // set AlaSQl path
 alasql.path = alasql.utils.findAlaSQLPath();
 /**
- 	Strip all comments.
- 	@function
- 	@param {string} str
- 	@return {string}
- 	Based om the https://github.com/lehni/uncomment.js/blob/master/uncomment.js
- 	I just replaced JavaScript's '//' to SQL's '--' and remove other stuff
-
- 	@todo Fixed [aaa/*bbb] for column names
- 	@todo Bug if -- comments in the last line
+	  Strip all comments.
+	  @function
+	  @param {string} str
+	  @return {string}
+	  Based om the https://github.com/lehni/uncomment.js/blob/master/uncomment.js
+	  I just replaced JavaScript's '//' to SQL's '--' and remove other stuff
+
+	  @todo Fixed [aaa/*bbb] for column names
+	  @todo Bug if -- comments in the last line
 	@todo Check if it possible to model it with Jison parser
 	@todo Remove unused code
  */
@@ -4367,7 +4384,6 @@ alasql.utils.uncomment = function (str) {
 	// preserveComment = false;
 
 	for (var i = 0, l = str.length; i < l; i++) {
-
 		// When checking for quote escaping, we also need to check that the
 		// escape sign itself is not escaped, as otherwise '\\' would cause
 		// the wrong impression of an unclosed string:
@@ -4377,7 +4393,6 @@ alasql.utils.uncomment = function (str) {
 			if (str[i] === quoteSign && unescaped) {
 				quote = false;
 			}
-
 		} else if (blockComment) {
 			// Is the block comment closing?
 			if (str[i] === '*' && str[i + 1] === '/') {
@@ -4414,7 +4429,6 @@ alasql.utils.uncomment = function (str) {
 				//					if (!preserveComment)
 				str[i] = '';
 				blockComment = true;
-
 			}
 		}
 	}
@@ -4600,17 +4614,18 @@ alasql.use = function (databaseid) {
 	if (!databaseid) {
 		databaseid = alasql.DEFAULTDATABASEID;
 	}
+
 	if (alasql.useid === databaseid) {
 		return;
 	}
+
 	if (alasql.databases[databaseid] !== undefined) {
 		alasql.useid = databaseid;
-		var db = alasql.databases[alasql.useid];
+		let db = alasql.databases[alasql.useid];
 		alasql.tables = db.tables;
-		//	alasql.fn = db.fn;
 		db.resetSqlCache();
 		if (alasql.options.usedbo) {
-			alasql.databases.dbo = db; // Operator???
+			alasql.databases.dbo = db;
 		}
 	} else {
 		throw Error('Database does not exist: ' + databaseid);
@@ -4650,7 +4665,9 @@ alasql.exec = function (sql, params, cb, scope) {
 	}
 
 	delete alasql.error;
+
 	params = params || {};
+
 	if (alasql.options.errorlog) {
 		try {
 			return alasql.dexec(alasql.useid, sql, params, cb, scope);
@@ -4676,14 +4693,14 @@ alasql.dexec = function (databaseid, sql, params, cb, scope) {
 
 	// Create hash
 	if (alasql.options.cache) {
-		var statement = db.sqlCache[hh];
+		let statement = db.sqlCache[hh];
 		// If database structure was not changed since last time return cache
 		if (statement && db.dbversion === statement.dbversion) {
 			return statement(params, cb);
 		}
 	}
 
-	var ast = db.astCache[hh];
+	let ast = db.astCache[hh];
 	if (alasql.options.cache && !ast) {
 		// Create AST cache
 		ast = alasql.parse(sql);
@@ -4694,12 +4711,16 @@ alasql.dexec = function (databaseid, sql, params, cb, scope) {
 	} else {
 		ast = alasql.parse(sql);
 	}
+
 	if (!ast.statements) {
 		return;
 	}
+
 	if (0 === ast.statements.length) {
 		return 0;
-	} else if (1 === ast.statements.length) {
+	}
+
+	if (1 === ast.statements.length) {
 		if (ast.statements[0].compile) {
 			// Compile and Execute
 			var statement = ast.statements[0].compile(databaseid, params);
@@ -4719,20 +4740,18 @@ alasql.dexec = function (databaseid, sql, params, cb, scope) {
 			}
 			var res = (alasql.res = statement(params, cb, scope));
 			return res;
-		} else {
-
-			alasql.precompile(ast.statements[0], alasql.useid, params);
-			var res = (alasql.res = ast.statements[0].execute(databaseid, params, cb, scope));
-			return res;
-		}
-	} else {
-		// Multiple statements
-		if (cb) {
-			alasql.adrun(databaseid, ast, params, cb, scope);
-		} else {
-			return alasql.drun(databaseid, ast, params, cb, scope);
 		}
+		alasql.precompile(ast.statements[0], alasql.useid, params);
+		var res = (alasql.res = ast.statements[0].execute(databaseid, params, cb, scope));
+		return res;
 	}
+
+	if (cb) {
+		alasql.adrun(databaseid, ast, params, cb, scope);
+		return;
+	}
+
+	return alasql.drun(databaseid, ast, params, cb, scope);
 };
 
 /**
@@ -4791,28 +4810,30 @@ alasql.adrun = function (databaseid, ast, params, cb, scope) {
 		if (data !== undefined) {
 			res.push(data);
 		}
+
 		var astatement = ast.statements.shift();
 		if (!astatement) {
 			if (useid !== databaseid) {
 				alasql.use(useid);
 			}
 			cb(res);
-			//			alasql.busy--;
-			//			if(alasql.busy<0) alasql.busy = 0;
-		} else {
-			if (astatement.compile) {
-				var statement = astatement.compile(alasql.useid);
-				statement(params, adrunone, scope);
-				if (alasql.options.progress !== false) {
-					alasql.options.progress(noqueries, idx++);
-				}
-			} else {
-				alasql.precompile(ast.statements[0], alasql.useid, params);
-				astatement.execute(alasql.useid, params, adrunone);
-				if (alasql.options.progress !== false) {
-					alasql.options.progress(noqueries, idx++);
-				}
+			return;
+		}
+
+		if (astatement.compile) {
+			var statement = astatement.compile(alasql.useid);
+			statement(params, adrunone, scope);
+			if (alasql.options.progress !== false) {
+				alasql.options.progress(noqueries, idx++);
 			}
+			return;
+		}
+
+		alasql.precompile(ast.statements[0], alasql.useid, params);
+		astatement.execute(alasql.useid, params, adrunone);
+
+		if (alasql.options.progress !== false) {
+			alasql.options.progress(noqueries, idx++);
 		}
 	}
 
@@ -4828,29 +4849,27 @@ alasql.adrun = function (databaseid, ast, params, cb, scope) {
 alasql.compile = function (sql, databaseid) {
 	databaseid = databaseid || alasql.useid;
 
-	var ast = alasql.parse(sql); // Create AST
+	let ast = alasql.parse(sql); // Create AST
 
-	if (1 === ast.statements.length) {
-		var statement = ast.statements[0].compile(databaseid);
-		statement.promise = function (params) {
-			return new Promise(function (resolve, reject) {
-				statement(params, function (data, err) {
-					if (err) {
-						reject(err);
-					} else {
-						resolve(data);
-					}
-				});
-			});
-		};
+	if (1 !== ast.statements.length)
+		throw new Error('Cannot compile, because number of statements in SQL is not equal to 1');
 
-		return statement;
+	var statement = ast.statements[0].compile(databaseid);
 
-	} else {
-		throw new Error('Cannot compile, because number of statements in SQL is not equal to 1');
-	}
-};
+	statement.promise = function (params) {
+		return new Promise(function (resolve, reject) {
+			statement(params, function (data, err) {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(data);
+				}
+			});
+		});
+	};
 
+	return statement;
+};
 //
 // Promises for AlaSQL
 //
@@ -4876,6 +4895,7 @@ var promiseExec = function (sql, params, counterStep, counterTotal) {
 
 const sequentialPromiseResolver = (promiseData, Promise) => {
 	var startingPoint = Promise.resolve([]);
+
 	promiseData.forEach(p => {
 		startingPoint = startingPoint.then(previousResult =>
 			promiseExec(p.sql, p.params, p.i, p.length).then(result => [...previousResult, result])
@@ -5233,7 +5253,6 @@ class Recordset {
 
 alasql.Recordset = Recordset;
 alasql.Query = Query;
-
 /*
 //
 // Parser helper for Alasql.js
@@ -5626,7 +5645,6 @@ yy.Search = class Search {
 						alasql.vars[sel.args[0]] = oldv;
 						return r1;
 					}
-
 				} else if (sel.selid === 'ARRAY') {
 					var nest = processSelector(sel.args, 0, value);
 					if (nest.length > 0) {
@@ -5919,10 +5937,6 @@ yy.Search = class Search {
 			) {
 				fromdata = fromdata.find().fetch();
 			}
-
-			//		if(typeof fromdata == 'object' && Array.isArray(fromdata)) {
-			//			selectors.unshift({srchid:'CHILD'});
-			//		}
 		}
 
 		// If source data is array than first step is to run over array
@@ -6386,7 +6400,7 @@ var compileSearchOrder = function (order) {
 					s += `if (
 							(a[${JSON.stringify(columnid)}]||'')${dg}
 							${ord.direction === 'ASC' ? '>' : '<'}
-							(b[${JSON.stringify(columnid)}]||'')${dg} 
+							(b[${JSON.stringify(columnid)}]||'')${dg}
 						) return 1;
 
 						if(
@@ -6402,26 +6416,17 @@ var compileSearchOrder = function (order) {
 				if (ord.nocase) {
 					dg += '.toUpperCase()';
 				}
-				s +=
-					'if((' +
-					ord.toJS('a', '') +
-					"||'')" +
-					dg +
-					(ord.direction === 'ASC' ? '>(' : '<(') +
-					ord.toJS('b', '') +
-					"||'')" +
-					dg +
-					')return 1;';
-				s +=
-					'if((' +
-					ord.toJS('a', '') +
-					"||'')" +
-					dg +
-					'==(' +
-					ord.toJS('b', '') +
-					"||'')" +
-					dg +
-					'){';
+				s += `
+					if (
+						(${ord.toJS('a', '')} || '')${dg}
+						${ord.direction === 'ASC' ? '>' : '<'}
+						(${ord.toJS('b', '')} || '')${dg}
+					) return 1;
+
+					if (
+						(${ord.toJS('a', '')} || '')${dg} ==
+						(${ord.toJS('b', '')} || '')${dg}
+					) {`;
 			}
 
 			// TODO Add date comparision
@@ -6438,11 +6443,8 @@ var compileSearchOrder = function (order) {
 };
 // Main query procedure
 function queryfn(query, oldscope, cb, A, B) {
-	var aaa = query.sources.length;
-
-	var ms;
 	query.sourceslen = query.sources.length;
-	var slen = query.sourceslen;
+	let slen = query.sourceslen;
 	query.query = query; // TODO Remove to prevent memory leaks
 	query.A = A;
 	query.B = B;
@@ -6479,10 +6481,7 @@ function queryfn(query, oldscope, cb, A, B) {
 
 	}
 
-	var scope;
-	if (!oldscope) scope = {};
-	else scope = cloneDeep(oldscope);
-	query.scope = scope;
+	query.scope = oldscope ? cloneDeep(oldscope) : {};
 
 	// First - refresh data sources
 
@@ -6494,19 +6493,21 @@ function queryfn(query, oldscope, cb, A, B) {
 		var rs = source.datafn(query, query.params, queryfn2, idx, alasql);
 
 		if (typeof rs !== 'undefined') {
-			// TODO - this is a hack: check if result is array - check all cases and
-			// make it more logical
-			if ((query.intofn || query.intoallfn) && Array.isArray(rs)) rs = rs.length;
+			// TODO - this is a hack: check if result is array - check all cases and make it more logical
+			if ((query.intofn || query.intoallfn) && Array.isArray(rs)) {
+				rs = rs.length;
+			}
 			result = rs;
 		}
 		//
 		// Ugly hack to use in query.wherefn and source.srcwherefns functions
 		// constructions like this.queriesdata['test'].
-		// I can elimite it with source.srcwherefn.bind(this)()
+		// We can elimite it with source.srcwherefn.bind(this)()
 		// but it may be slow.
 		//
 		source.queriesdata = query.queriesdata;
 	});
+
 	if (query.sources.length == 0 || 0 === slen) {
 		try {
 			result = queryfn3(query);
@@ -6554,13 +6555,7 @@ function queryfn3(query) {
 		jlen;
 
 	// Preindexation of data sources
-	//	if(!oldscope) {
 	preIndex(query);
-	//	}
-
-	// query.sources.forEach(function(source) {
-
-	// });
 
 	// Prepare variables
 	query.data = [];
@@ -6571,17 +6566,14 @@ function queryfn3(query) {
 	var h = 0;
 
 	// Start walking over data
-
 	doJoin(query, scope, h);
 
 	// If grouping, then filter groups with HAVING function
-
 	if (query.groupfn) {
 		query.data = [];
 		if (query.groups.length === 0 && query.allgroups.length === 0) {
 			var g = {};
 			if (query.selectGroup.length > 0) {
-
 				query.selectGroup.forEach(function (sg) {
 					if (
 						sg.aggregatorid == 'COUNT' ||
@@ -6595,37 +6587,25 @@ function queryfn3(query) {
 				});
 			}
 			query.groups = [g];
-
 		}
 
-		// ******
-
 		if (query.aggrKeys.length > 0) {
 			var gfns = '';
 			query.aggrKeys.forEach(function (col) {
-				gfns += `g[${JSON.stringify(col.nick)}] = alasql.aggr[${JSON.stringify(
+				gfns += `
+				g[${JSON.stringify(col.nick)}] = alasql.aggr[${JSON.stringify(
 					col.funcid
-				)}](undefined,g[${JSON.stringify(col.nick)}],3);`;
-
-				//				gfns += 'return g[\''+col.nick+'\];';
+				)}](undefined,g[${JSON.stringify(col.nick)}],3); `;
 			});
-
 			var gfn = new Function('g,params,alasql', 'var y;' + gfns);
 		}
 
-		// *******
-
-		// 	debugger;
-		// if(false && (query.groups.length == 1) && (Object.keys(query.groups[0]).length == 0)) {
-
-		// } else {
 		for (var i = 0, ilen = query.groups.length; i < ilen; i++) {
 			var g = query.groups[i];
 
 			if (gfn) gfn(g, query.params, alasql);
 
 			if (!query.havingfn || query.havingfn(g, query.params, alasql)) {
-
 				var d = query.selectgfn(g, query.params, alasql);
 
 				for (const key in query.groupColumns) {
@@ -6641,9 +6621,6 @@ function queryfn3(query) {
 				query.data.push(d);
 			}
 		}
-		// }
-
-		//			query.groups = query.groups.filter();
 	}
 	// Remove distinct values
 	doDistinct(query);
@@ -6752,9 +6729,6 @@ function queryfn3(query) {
 	// Reduce to limit and offset
 	doLimit(query);
 
-	// Remove Angular.js artifacts and other unnecessary columns
-	// Issue #25
-
 	// TODO: Check what artefacts rest from Angular.js
 	if (typeof angular != 'undefined') {
 		query.removeKeys.push('$$hashKey');
@@ -6796,7 +6770,6 @@ function queryfn3(query) {
 			for (var k in r) {
 				for (j = 0; j < query.removeLikeKeys.length; j++) {
 					if (alasql.utils.like(query.removeLikeKeys[j], k)) {
-						//					if(k.match(query.removeLikeKeys[j])) {
 						delete r[k];
 					}
 				}
@@ -6807,7 +6780,6 @@ function queryfn3(query) {
 			query.columns = query.columns.filter(function (column) {
 				var found = false;
 				removeLikeKeys.forEach(function (key) {
-					//					if(column.columnid.match(key)) found = true;
 					if (alasql.utils.like(key, column.columnid)) {
 						found = true;
 					}
@@ -6818,31 +6790,25 @@ function queryfn3(query) {
 	}
 
 	if (query.pivotfn) query.pivotfn();
+
 	if (query.unpivotfn) query.unpivotfn();
 
 	if (query.intoallfn) {
-
-		//		var res = query.intoallfn(query.columns,query.cb,query.A, query.B, alasql);
 		var res = query.intoallfn(query.columns, query.cb, query.params, query.alasql);
-
-		//		if(query.cb) res = query.cb(res,query.A, query.B);
-
-		//		debugger;
 		return res;
-	} else if (query.intofn) {
+	}
+
+	if (query.intofn) {
 		ilen = query.data.length;
 		for (i = 0; i < ilen; i++) {
 			query.intofn(query.data[i], i, query.params, query.alasql);
 		}
-
 		if (query.cb) query.cb(query.data.length, query.A, query.B);
 		return query.data.length;
-	} else {
-
-		res = query.data;
-		if (query.cb) res = query.cb(query.data, query.A, query.B);
-		return res;
 	}
+	res = query.data;
+	if (query.cb) res = query.cb(query.data, query.A, query.B);
+	return res;
 }
 
 // Limiting
@@ -6895,14 +6861,13 @@ var preIndex = function (query) {
 		var source = query.sources[k];
 		delete source.ix;
 		// If there is indexation rule
-
 		if (k > 0 && source.optimization == 'ix' && source.onleftfn && source.onrightfn) {
 			// If there is no table.indices - create it
 			if (source.databaseid && alasql.databases[source.databaseid].tables[source.tableid]) {
 				if (!alasql.databases[source.databaseid].tables[source.tableid].indices)
 					query.database.tables[source.tableid].indices = {};
 				// Check if index already exists
-				var ixx =
+				let ixx =
 					alasql.databases[source.databaseid].tables[source.tableid].indices[
 						hash(source.onrightfns + '`' + source.srcwherefns)
 					];
@@ -6914,10 +6879,10 @@ var preIndex = function (query) {
 			if (!source.ix) {
 				source.ix = {};
 				// Walking over source data
-				var scope = {};
-				var i = 0;
-				var ilen = source.data.length;
-				var dataw;
+				let scope = {};
+				let i = 0;
+				let ilen = source.data.length;
+				let dataw;
 				//				while(source.getfn i<ilen) {
 
 				while (
@@ -6926,9 +6891,7 @@ var preIndex = function (query) {
 					i < ilen
 				) {
 					if (source.getfn && !source.dontcache) source.data[i] = dataw;
-					//					scope[tableid] = dataw;
 
-					//				for(var i=0, ilen=source.data.length; i<ilen; i++) {
 					// Prepare scope for indexation
 					scope[source.alias || source.tableid] = dataw;
 
@@ -6995,7 +6958,6 @@ var preIndex = function (query) {
 					group.push(source.data[i]);
 					i++;
 				}
-				//					query.database.tables[source.tableid].indices[hash(source.wxleftfns+'`'+source.onwherefns)] = source.ix;
 				if (!alasql.databases[source.databaseid].engineid) {
 					alasql.databases[source.databaseid].tables[source.tableid].indices[
 						hash(source.wxleftfns + '`')
@@ -7014,7 +6976,6 @@ var preIndex = function (query) {
 					source.data = [];
 				}
 			}
-			//			}
 			// If there is no any optimization than apply srcwhere filter
 		} else if (source.srcwherefns && !source.dontcache) {
 			if (source.data) {
@@ -7023,16 +6984,13 @@ var preIndex = function (query) {
 
 				source.data = source.data.filter(function (r) {
 					scope[source.alias] = r;
-
 					return source.srcwherefn(scope, query.params, alasql);
 				});
 
 				scope = {};
 				i = 0;
 				ilen = source.data.length;
-				//var dataw;
-				var res = [];
-				//				while(source.getfn i<ilen) {
+				let res = [];
 
 				while (
 					(dataw = source.data[i]) ||
@@ -7051,7 +7009,6 @@ var preIndex = function (query) {
 		}
 		// Change this to another place (this is a wrong)
 		if (source.databaseid && alasql.databases[source.databaseid].tables[source.tableid]) {
-			//query.database.tables[source.tableid].dirty = false;
 		} else {
 			// this is a subquery?
 		}
@@ -7062,34 +7019,24 @@ var preIndex = function (query) {
 //
 
 function doJoin(query, scope, h) {
-
 	// Check, if this is a last join?
 	if (h >= query.sources.length) {
 		// Todo: check if this runs once too many
-
 		// Then apply where and select
-
 		if (query.wherefn(scope, query.params, alasql)) {
-
-			//			var res = query.selectfn(scope, query.params, alasql);
-
 			// If there is a GROUP BY then pipe to grouping function
 			if (query.groupfn) {
 				query.groupfn(scope, query.params, alasql);
 			} else {
-				//				query.qwerty = 999;
-
 				query.data.push(query.selectfn(scope, query.params, alasql));
 			}
 		}
 	} else if (query.sources[h].applyselect) {
-
 		var source = query.sources[h];
 		source.applyselect(
 			query.params,
 			function (data) {
 				if (data.length > 0) {
-
 					for (var i = 0; i < data.length; i++) {
 						scope[source.alias] = data[i];
 						doJoin(query, scope, h + 1);
@@ -7103,101 +7050,79 @@ function doJoin(query, scope, h) {
 			},
 			scope
 		);
-
 	} else {
 		// STEP 1
 
-		var source = query.sources[h];
-		var nextsource = query.sources[h + 1];
-
-		//		if(source.joinmode == "LEFT" || source.joinmode == "INNER" || source.joinmode == "RIGHT"
-		//			|| source.joinmode == "OUTER" || source.joinmode == "SEMI") {
-		// Todo: check if this is smart
-		if (true) {
-			//source.joinmode != "ANTI") {
-
-			var tableid = source.alias || source.tableid;
-			var pass = false; // For LEFT JOIN
-			var data = source.data;
-			var opt = false;
+		let source = query.sources[h];
+		let nextsource = query.sources[h + 1];
 
-			// Reduce data for looping if there is optimization hint
-			if (!source.getfn || (source.getfn && !source.dontcache)) {
-				if (
-					source.joinmode != 'RIGHT' &&
-					source.joinmode != 'OUTER' &&
-					source.joinmode != 'ANTI' &&
-					source.optimization == 'ix'
-				) {
-					data = source.ix[source.onleftfn(scope, query.params, alasql)] || [];
-					opt = true;
+		let tableid = source.alias || source.tableid;
+		let pass = false; // For LEFT JOIN
+		let data = source.data;
+		let opt = false;
 
-				}
-			}
-
-			// Main cycle
-			var i = 0;
-			if (typeof data == 'undefined') {
-				throw new Error('Data source number ' + h + ' in undefined');
+		// Reduce data for looping if there is optimization hint
+		if (!source.getfn || (source.getfn && !source.dontcache)) {
+			if (
+				source.joinmode != 'RIGHT' &&
+				source.joinmode != 'OUTER' &&
+				source.joinmode != 'ANTI' &&
+				source.optimization == 'ix'
+			) {
+				data = source.ix[source.onleftfn(scope, query.params, alasql)] || [];
+				opt = true;
 			}
-			var ilen = data.length;
-			var dataw;
-
-			while ((dataw = data[i]) || (!opt && source.getfn && (dataw = source.getfn(i))) || i < ilen) {
-				if (!opt && source.getfn && !source.dontcache) data[i] = dataw;
-
-				scope[tableid] = dataw;
-
-				// Reduce with ON and USING clause
-				var usingPassed = !source.onleftfn;
-				if (!usingPassed) {
-					var left = source.onleftfn(scope, query.params, alasql);
-					var right = source.onrightfn(scope, query.params, alasql);
-					if (left instanceof String || left instanceof Number) left = left.valueOf();
-					if (right instanceof String || right instanceof Number) right = left.valueOf();
-					usingPassed = left == right;
-				}
-
-				if (usingPassed) {
-					// For all non-standard JOINs like a-b=0
-					if (source.onmiddlefn(scope, query.params, alasql)) {
-						// Recursively call new join
-						//						if(source.joinmode == "LEFT" || source.joinmode == "INNER" || source.joinmode == "OUTER" || source.joinmode == "RIGHT" ) {
-						if (source.joinmode != 'SEMI' && source.joinmode != 'ANTI') {
+		}
 
-							doJoin(query, scope, h + 1);
-						}
+		// Main cycle
+		let i = 0;
+		if (typeof data == 'undefined') {
+			throw new Error('Data source number ' + h + ' in undefined');
+		}
+		let ilen = data.length;
+		let dataw;
 
-						// if(source.data[i].f = 200) debugger;
+		while ((dataw = data[i]) || (!opt && source.getfn && (dataw = source.getfn(i))) || i < ilen) {
+			if (!opt && source.getfn && !source.dontcache) data[i] = dataw;
+			scope[tableid] = dataw;
 
-						//						if(source.joinmode == "RIGHT" || source.joinmode == "ANTI" || source.joinmode == "OUTER") {
-						if (source.joinmode != 'LEFT' && source.joinmode != 'INNER') {
-							dataw._rightjoin = true;
-						}
+			// Reduce with ON and USING clause
+			var usingPassed = !source.onleftfn;
+			if (!usingPassed) {
+				var left = source.onleftfn(scope, query.params, alasql);
+				var right = source.onrightfn(scope, query.params, alasql);
+				if (left instanceof String || left instanceof Number) left = left.valueOf();
+				if (right instanceof String || right instanceof Number) right = left.valueOf();
+				usingPassed = left == right;
+			}
 
-						// for LEFT JOIN
-						pass = true;
+			if (usingPassed) {
+				// For all non-standard JOINs like a-b=0
+				if (source.onmiddlefn(scope, query.params, alasql)) {
+					// Recursively call new join
+					if (source.joinmode != 'SEMI' && source.joinmode != 'ANTI') {
+						doJoin(query, scope, h + 1);
+					}
+					if (source.joinmode != 'LEFT' && source.joinmode != 'INNER') {
+						dataw._rightjoin = true;
 					}
-				}
-				i++;
-			}
 
-			// Additional join for LEFT JOINS
-			if (
-				(source.joinmode == 'LEFT' || source.joinmode == 'OUTER' || source.joinmode == 'SEMI') &&
-				!pass
-			) {
-				// Clear the scope after the loop
-				scope[tableid] = {};
-				doJoin(query, scope, h + 1);
+					// for LEFT JOIN
+					pass = true;
+				}
 			}
+			i++;
 		}
 
-		// When there is no records
-		//		if(data.length == 0 && query.groupfn) {
-		//			scope[tableid] = undefined;
-		//			doJoin(query,scope,h+1);
-		//		}
+		// Additional join for LEFT JOINS
+		if (
+			(source.joinmode == 'LEFT' || source.joinmode == 'OUTER' || source.joinmode == 'SEMI') &&
+			!pass
+		) {
+			// Clear the scope after the loop
+			scope[tableid] = {};
+			doJoin(query, scope, h + 1);
+		}
 
 		// STEP 2
 
@@ -7210,9 +7135,9 @@ function doJoin(query, scope, h) {
 				) {
 					scope[source.alias] = {};
 
-					var j = 0;
-					var jlen = nextsource.data.length;
-					var dataw;
+					let j = 0;
+					let jlen = nextsource.data.length;
+					let dataw;
 
 					while (
 						(dataw = nextsource.data[j]) ||
@@ -7243,7 +7168,6 @@ function doJoin(query, scope, h) {
 		}
 
 		scope[tableid] = undefined;
-
 	}
 }
 
@@ -7631,7 +7555,6 @@ yy.Select = class Select {
 				query.intoallfn = new Function('columns,cb,params,alasql', 'var y;' + query.intoallfns);
 			}
 		}
-
 		// Now, compile all togeather into one function with query object in scope
 		var statement = function (params, cb, oldscope) {
 			query.params = params;
@@ -16776,10 +16699,14 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 		var dataLength = Object.keys(data).length;
 
 		// Generate columns if they are not defined
-		if ((!columns || columns.length == 0) && dataLength > 0) {
-			columns = Object.keys(data[0]).map(function (columnid) {
-				return {columnid: columnid};
-			});
+		if (!columns || columns.length == 0) {
+			if (dataLength > 0) {
+				columns = Object.keys(data[0]).map(function (columnid) {
+					return {columnid: columnid};
+				});
+			} else {
+				columns = [];
+			}
 		}
 
 		var cells = {};