alasql 2.1.3 → 2.1.5

package/bin/alasql-cli.js

@@ -44,6 +44,14 @@ let yargs = require('yargs')
 	.nargs('f', 1)
 	.normalize('f')
 
+	.boolean('ast')
+	.describe('ast', 'Print AST instead of result')
+	.normalize('ast')
+
+	/*.boolean('comp')
+	.describe('comp', 'Print compiled function instead of result')
+	.normalize('comp')*/
+
 	.help('h')
 	.alias('h', 'help')
 
@@ -115,6 +123,26 @@ function execute(sql, params) {
 		}
 	}
 
+	if (argv.ast) {
+		try {
+			console.log(formatOutput(alasql.parse(sql, params)));
+			process.exit(0);
+		} catch (e) {
+			console.error(e);
+			process.exit(1);
+		}
+	}
+
+	/*if (argv.comp) {
+		try {
+			console.log(alasql.compile(sql, params));
+			process.exit(0);
+		} catch (e) {
+			console.error(e);
+			process.exit(1);
+		}
+	}*/
+
 	alasql
 		.promise(sql, params)
 		.then(function (res) {

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.1.2-develop-e3d1ac82 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.4-develop-5f5b471d | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.1.2-develop-e3d1ac82
+@version 2.1.4-develop-5f5b471d
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v2.1.2-develop-e3d1ac82 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.4-develop-5f5b471d | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 !function(r,e){"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?module.exports=e():r.alasql=e()}(this,function(){function i(r,e,o){"function"==typeof(e=e||[])&&(scope=o,o=e,e=[]),"object"!=typeof e&&(e=[e]);var t=i.lastid++;i.buffer[t]=o,i.webworker.postMessage({id:t,sql:r,params:e})}var a;if(i.options={},i.options.progress=function(){},isArray=function(r){return"[object Array]"===Object.prototype.toString.call(r)},i.promise=function(){throw new Error("Please include a Promise/A+ library")},"undefined"!=typeof Promise&&(a=function(r,e,n,s){return new Promise(function(o,t){i(r,e,function(r,e){e?t(e):(n&&s&&!1!==i.options.progress&&i.options.progress(n,s),o(r))})})},i.promise=function(r,e){if("undefined"==typeof Promise)throw new Error("Please include a Promise/A+ library");if("string"==typeof r)return a(r,e);if(!isArray(r)||r.length<1||void 0!==e)throw new Error("Error in .promise parameters");var o=r;if(!(o.length<1)){for(var t,n,s=[],i=0;i<o.length;i++){if("string"==typeof(n=o[i])&&(n=[n]),!isArray(n)||n.length<1||2<n.length)throw new Error("Error in .promise parameter");t=n[0],n=n[1]||void 0,s.push(a(t,n,i,o.length))}return Promise.all(s)}}),i=i||!1)return i.worker=function(){throw new Error("Can find webworker in this enviroment")},"undefined"!=typeof Worker&&(i.worker=function(r,e,o){if(void 0===(r=!0===r?void 0:r))for(var t=document.getElementsByTagName("script"),n=0;n<t.length;n++){if("alasql-worker.js"===t[n].src.substr(-16).toLowerCase()){r=t[n].src.substr(0,t[n].src.length-16)+"alasql.js";break}if("alasql-worker.min.js"===t[n].src.substr(-20).toLowerCase()){r=t[n].src.substr(0,t[n].src.length-20)+"alasql.min.js";break}if("alasql.js"===t[n].src.substr(-9).toLowerCase()){r=t[n].src;break}if("alasql.min.js"===t[n].src.substr(-13).toLowerCase()){r=t[n].src.substr(0,t[n].src.length-13)+"alasql.min.js";break}}if(void 0===r)throw new Error("Path to alasql.js is not specified");var s;!1!==r?(s=(s="importScripts('")+r+"');self.onmessage = function(event) {alasql(event.data.sql,event.data.params, function(data){postMessage({id:event.data.id, data:data});});}",s=new Blob([s],{type:"text/plain"}),i.webworker=new Worker(URL.createObjectURL(s)),i.webworker.onmessage=function(r){var e=r.data.id;i.buffer[e](r.data.data),delete i.buffer[e]},i.webworker.onerror=function(r){throw r},1<arguments.length&&i("REQUIRE "+e.map(function(r){return'"'+r+'"'}).join(","),[],o)):!1===r&&delete i.webworker}),i.lastid=0,i.buffer={},i.worker(),i;throw new Error("alasql was not found")});

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.1.2-develop-e3d1ac82 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.4-develop-5f5b471d | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.1.2-develop-e3d1ac82
+@version 2.1.4-develop-5f5b471d
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '2.1.2-develop-e3d1ac82';
+alasql.version = '2.1.4-develop-5f5b471d';
 
 /**
 	Debug flag
@@ -3606,7 +3606,14 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
  @todo merge functionality from loadFile and LoadBinaryFile
  */
 
-var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error) {
+var loadBinaryFile = (utils.loadBinaryFile = function (
+	path,
+	runAsync,
+	success,
+	error = (x) => {
+		throw x;
+	}
+) {
 	var fs;
 	if (utils.isNode || utils.isMeteorServer) {
 		//*not-for-browser/*
@@ -3616,7 +3623,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 			var request = require('request');
 			request({url: path, encoding: null}, function (err, response, data) {
 				if (err) {
-					throw err;
+					return error(err);
 				}
 				var arr = [];
 				for (var i = 0; i < data.length; ++i) {
@@ -3625,10 +3632,10 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 				success(arr.join(''));
 			});
 		} else {
-			if (asy) {
+			if (runAsync) {
 				fs.readFile(path, function (err, data) {
 					if (err) {
-						throw err;
+						return error(err);
 					}
 					var arr = [];
 					for (var i = 0; i < data.length; ++i) {
@@ -3637,7 +3644,12 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 					success(arr.join(''));
 				});
 			} else {
-				var data = fs.readFileSync(path);
+				var data;
+				try {
+					data = fs.readFileSync(path);
+				} catch (e) {
+					return error(e);
+				}
 				var arr = [];
 				for (var i = 0; i < data.length; ++i) {
 					arr[i] = String.fromCharCode(data[i]);
@@ -3651,16 +3663,18 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 		var RNFetchBlob = require('react-native-fetch-blob').default;
 		var dirs = RNFetchBlob.fs.dirs;
 		//should use readStream instead if the file is large
-		RNFetchBlob.fs.readFile(path, 'base64').then(function (data) {
-			//RNFetchBlob.base64.decode(data) //need more test on excel
-			success(data);
-		});
+		RNFetchBlob.fs
+			.readFile(path, 'base64')
+			.then(function (data) {
+				success(data);
+			})
+			.catch(error);
 		//*/
 	} else {
 		if (typeof path === 'string') {
 			// For browser
 			var xhr = new XMLHttpRequest();
-			xhr.open('GET', path, asy); // Async
+			xhr.open('GET', path, runAsync); // Async
 			xhr.responseType = 'arraybuffer';
 			xhr.onload = function () {
 				var data = new Uint8Array(xhr.response);
@@ -3670,7 +3684,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 				}
 				success(arr.join(''));
 			};
-			// xhr.responseType = "blob";
+			xhr.onerror = error;
 			xhr.send();
 		} else if (path instanceof Event) {
 
@@ -3681,6 +3695,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 				var data = e.target.result;
 				success(data);
 			};
+			reader.onerror = error();
 			reader.readAsArrayBuffer(files[0]);
 		} else if (path instanceof Blob) {
 			success(path);
@@ -4536,6 +4551,10 @@ alasql.options.excel = {cellDates: true};
 
 alasql.options.joinstar = 'overwrite'; // Option for SELECT * FROM a,b
 
+alasql.options.loopbreak = 100000;
+
+alasql.options;
+
 //alasql.options.worker = false;
 
 // Variables
@@ -5682,7 +5701,7 @@ function doSearch(databaseid, params, cb) {
 		//			throw new Error('Selector "'+sel.srchid+'" not found');
 		//		};
 
-		var SECURITY_BREAK = 100000;
+		var INFINITE_LOOP_BREAK = alasql.options.loopbreak || 100000;
 
 		if (sel.selid) {
 			// TODO Process Selector
@@ -5913,8 +5932,8 @@ function doSearch(databaseid, params, cb) {
 						}
 						// Security brake
 						i++;
-						if (i > SECURITY_BREAK) {
-							throw new Error('Security brake. Number of iterations = ' + i);
+						if (i > INFINITE_LOOP_BREAK) {
+							throw new Error('Infinite loop brake. Number of iterations = ' + i);
 						}
 					}
 				}
@@ -6094,8 +6113,8 @@ function doSearch(databaseid, params, cb) {
 
 					// Security brake
 					i++;
-					if (i > SECURITY_BREAK) {
-						throw new Error('Security brake. Number of iterations = ' + i);
+					if (i > INFINITE_LOOP_BREAK) {
+						throw new Error('Infinite loop brake. Number of iterations = ' + i);
 					}
 				}
 				return retval;
@@ -6129,8 +6148,8 @@ function doSearch(databaseid, params, cb) {
 
 					// Security brake
 					i++;
-					if (i > SECURITY_BREAK) {
-						throw new Error('Loop brake. Number of iterations = ' + i);
+					if (i > INFINITE_LOOP_BREAK) {
+						throw new Error('Infinite loop brake. Number of iterations = ' + i);
 					}
 				}
 
@@ -11483,7 +11502,7 @@ yy.AggrValue.prototype.toType = function () {
 		return this.expression.toType();
 	}
 
-	// todo: implement default;
+	return this.expression.toType();
 };
 
 yy.AggrValue.prototype.toJS = function (/*context, tableid, defcols*/) {
@@ -11934,42 +11953,39 @@ alasql.aggr.GROUP_CONCAT = function (v, s, stage) {
 	return s;
 };
 
-alasql.aggr.MEDIAN = function (v, s, stage) {
+alasql.aggr.median = alasql.aggr.MEDIAN = function (v, s, stage) {
 	if (stage === 2) {
 		if (v !== null) {
 			s.push(v);
 		}
 		return s;
-	} else if (stage === 1) {
+	}
+
+	if (stage === 1) {
 		if (v === null) {
 			return [];
 		}
 		return [v];
-	} else {
-		if (!s.length) {
-			return s;
-		}
+	}
 
-		var r = s.sort(function (a, b) {
-			if (a === b) {
-				return 0;
-			}
-			if (a > b) {
-				return 1;
-			}
-			return -1;
-		});
-		var p = (r.length + 1) / 2;
-		if (Number.isInteger(p)) {
-			return r[p - 1];
-		}
+	if (!s.length) {
+		return null;
+	}
 
-		var value = r[Math.floor(p - 1)];
-		if (typeof value !== 'number' && !(value instanceof Number)) {
-			return value;
-		}
+	var r = s.sort((a, b) => {
+		if (a > b) return 1;
+		if (a < b) return -1;
+		return 0;
+	});
 
-		return (value + r[Math.ceil(p - 1)]) / 2;
+	var middle = (r.length + 1) / 2;
+	var middleFloor = middle | 0;
+	var el = r[middleFloor - 1];
+
+	if (middle === middleFloor || (typeof el !== 'number' && !(el instanceof Number))) {
+		return el;
+	} else {
+		return (el + r[middleFloor]) / 2;
 	}
 };
 

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.1.2-develop-e3d1ac82 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.4-develop-5f5b471d | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.1.2-develop-e3d1ac82
+@version 2.1.4-develop-5f5b471d
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '2.1.2-develop-e3d1ac82';
+alasql.version = '2.1.4-develop-5f5b471d';
 
 /**
 	Debug flag
@@ -3605,7 +3605,14 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
  @todo merge functionality from loadFile and LoadBinaryFile
  */
 
-var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error) {
+var loadBinaryFile = (utils.loadBinaryFile = function (
+	path,
+	runAsync,
+	success,
+	error = (x) => {
+		throw x;
+	}
+) {
 	var fs;
 	if (utils.isNode || utils.isMeteorServer) {
 		/*not-for-browser/*
@@ -3615,7 +3622,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 			var request = require('request');
 			request({url: path, encoding: null}, function (err, response, data) {
 				if (err) {
-					throw err;
+					return error(err);
 				}
 				var arr = [];
 				for (var i = 0; i < data.length; ++i) {
@@ -3624,10 +3631,10 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 				success(arr.join(''));
 			});
 		} else {
-			if (asy) {
+			if (runAsync) {
 				fs.readFile(path, function (err, data) {
 					if (err) {
-						throw err;
+						return error(err);
 					}
 					var arr = [];
 					for (var i = 0; i < data.length; ++i) {
@@ -3636,7 +3643,12 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 					success(arr.join(''));
 				});
 			} else {
-				var data = fs.readFileSync(path);
+				var data;
+				try {
+					data = fs.readFileSync(path);
+				} catch (e) {
+					return error(e);
+				}
 				var arr = [];
 				for (var i = 0; i < data.length; ++i) {
 					arr[i] = String.fromCharCode(data[i]);
@@ -3650,16 +3662,17 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 		var RNFetchBlob = require('react-native-fetch-blob')["default"];
 		var dirs = RNFetchBlob.fs.dirs;
 		//should use readStream instead if the file is large
-		RNFetchBlob.fs.readFile(path, 'base64').then(function (data) {
-			//RNFetchBlob.base64.decode(data) //need more test on excel
-			success(data);
-		});
+		RNFetchBlob.fs
+			.readFile(path, 'base64')
+			.then(function (data) {
+				success(data);
+			})["catch"](error);
 		//*/
 	} else {
 		if (typeof path === 'string') {
 			// For browser
 			var xhr = new XMLHttpRequest();
-			xhr.open('GET', path, asy); // Async
+			xhr.open('GET', path, runAsync); // Async
 			xhr.responseType = 'arraybuffer';
 			xhr.onload = function () {
 				var data = new Uint8Array(xhr.response);
@@ -3669,7 +3682,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 				}
 				success(arr.join(''));
 			};
-			// xhr.responseType = "blob";
+			xhr.onerror = error;
 			xhr.send();
 		} else if (path instanceof Event) {
 
@@ -3680,6 +3693,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (path, asy, success, error
 				var data = e.target.result;
 				success(data);
 			};
+			reader.onerror = error();
 			reader.readAsArrayBuffer(files[0]);
 		} else if (path instanceof Blob) {
 			success(path);
@@ -4531,6 +4545,10 @@ alasql.options.excel = {cellDates: true};
 
 alasql.options.joinstar = 'overwrite'; // Option for SELECT * FROM a,b
 
+alasql.options.loopbreak = 100000;
+
+alasql.options;
+
 //alasql.options.worker = false;
 
 // Variables
@@ -5677,7 +5695,7 @@ function doSearch(databaseid, params, cb) {
 		//			throw new Error('Selector "'+sel.srchid+'" not found');
 		//		};
 
-		var SECURITY_BREAK = 100000;
+		var INFINITE_LOOP_BREAK = alasql.options.loopbreak || 100000;
 
 		if (sel.selid) {
 			// TODO Process Selector
@@ -5908,8 +5926,8 @@ function doSearch(databaseid, params, cb) {
 						}
 						// Security brake
 						i++;
-						if (i > SECURITY_BREAK) {
-							throw new Error('Security brake. Number of iterations = ' + i);
+						if (i > INFINITE_LOOP_BREAK) {
+							throw new Error('Infinite loop brake. Number of iterations = ' + i);
 						}
 					}
 				}
@@ -6089,8 +6107,8 @@ function doSearch(databaseid, params, cb) {
 
 					// Security brake
 					i++;
-					if (i > SECURITY_BREAK) {
-						throw new Error('Security brake. Number of iterations = ' + i);
+					if (i > INFINITE_LOOP_BREAK) {
+						throw new Error('Infinite loop brake. Number of iterations = ' + i);
 					}
 				}
 				return retval;
@@ -6124,8 +6142,8 @@ function doSearch(databaseid, params, cb) {
 
 					// Security brake
 					i++;
-					if (i > SECURITY_BREAK) {
-						throw new Error('Loop brake. Number of iterations = ' + i);
+					if (i > INFINITE_LOOP_BREAK) {
+						throw new Error('Infinite loop brake. Number of iterations = ' + i);
 					}
 				}
 
@@ -11478,7 +11496,7 @@ yy.AggrValue.prototype.toType = function () {
 		return this.expression.toType();
 	}
 
-	// todo: implement default;
+	return this.expression.toType();
 };
 
 yy.AggrValue.prototype.toJS = function (/*context, tableid, defcols*/) {
@@ -11929,42 +11947,39 @@ alasql.aggr.GROUP_CONCAT = function (v, s, stage) {
 	return s;
 };
 
-alasql.aggr.MEDIAN = function (v, s, stage) {
+alasql.aggr.median = alasql.aggr.MEDIAN = function (v, s, stage) {
 	if (stage === 2) {
 		if (v !== null) {
 			s.push(v);
 		}
 		return s;
-	} else if (stage === 1) {
+	}
+
+	if (stage === 1) {
 		if (v === null) {
 			return [];
 		}
 		return [v];
-	} else {
-		if (!s.length) {
-			return s;
-		}
+	}
 
-		var r = s.sort(function (a, b) {
-			if (a === b) {
-				return 0;
-			}
-			if (a > b) {
-				return 1;
-			}
-			return -1;
-		});
-		var p = (r.length + 1) / 2;
-		if (Number.isInteger(p)) {
-			return r[p - 1];
-		}
+	if (!s.length) {
+		return null;
+	}
 
-		var value = r[Math.floor(p - 1)];
-		if (typeof value !== 'number' && !(value instanceof Number)) {
-			return value;
-		}
+	var r = s.sort((a, b) => {
+		if (a > b) return 1;
+		if (a < b) return -1;
+		return 0;
+	});
 
-		return (value + r[Math.ceil(p - 1)]) / 2;
+	var middle = (r.length + 1) / 2;
+	var middleFloor = middle | 0;
+	var el = r[middleFloor - 1];
+
+	if (middle === middleFloor || (typeof el !== 'number' && !(el instanceof Number))) {
+		return el;
+	} else {
+		return (el + r[middleFloor]) / 2;
 	}
 };