alasql 2.2.5 → 2.3.0

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.2.4-develop-d97ae856 | © 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.4-develop-d97ae856
+@version 2.2.5-develop-63c84c04
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v2.2.4-develop-d97ae856 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.2.5-develop-63c84c04 | © 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.2.4-develop-d97ae856 | © 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.4-develop-d97ae856
+@version 2.2.5-develop-63c84c04
 
 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.2.4-develop-d97ae856';
+alasql.version = '2.2.5-develop-63c84c04';
 
 /**
 	Debug flag
@@ -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
@@ -11389,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;
@@ -11413,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;
@@ -11495,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');
@@ -16994,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);
 			}
 		}
 

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.2.4-develop-d97ae856 | © 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.4-develop-d97ae856
+@version 2.2.5-develop-63c84c04
 
 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.2.4-develop-d97ae856';
+alasql.version = '2.2.5-develop-63c84c04';
 
 /**
 	Debug flag
@@ -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
@@ -11389,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;
@@ -11413,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;
@@ -11495,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');
@@ -16994,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);
 			}
 		}