alasql 1.7.3 → 1.7.4

package/.github/workflows/nodejs.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 15.x]
+        node-version: [12.x, 14.x, 16.x, 17.x]
 
     steps:
     - uses: actions/checkout@v2

package/README.md

@@ -1,7 +1,3 @@
-<h2>
-Please use version 1.x as prior versions has a security flaw if you use user generated data to concat your SQL strings instead of providing them as a parameters to AlaSQL. 
-</h2>
-
 _AlaSQL is an open source project used on more than two million page views per month - and we appreciate any and all contributions we can get. [Please help out](https://github.com/agershun/alasql/labels/Please%20help%20out%21)._
 
 _Have a question? Ask on [Stack Overflow](http://stackoverflow.com/questions/ask?tags=AlaSQL) using the "alasql" tag._
@@ -475,7 +471,7 @@ var b = browserify("./main.js").bundle();
 
 #### Vue
 
-For some frameworks (lige Vue) alasql cant access XLSX by it self. We recommend handeling it by including AlaSQL the following way:
+For some frameworks (lige Vue) alasql cant access XLSX by it self. We recommend handling it by including AlaSQL the following way:
 
 ```import alasql from 'alasql';
 import XLSX from 'xlsx';
@@ -605,9 +601,15 @@ The testruns can be found in the [testlog](TESTLOG.md).
 
 
 
-## Bleeding Edge
+## Contributing
+
+See [Contributing](CONTRIBUTING.md) for details.
+
+Thanks to all the people who already contributed!
 
-If you want to try the most recent development version of the library please download [this file](https://rawgit.com/agershun/alasql/develop/dist/alasql.fs.js) or visit the [testbench](https://rawgit.com/agershun/alasql/develop/utils/testbench.html) to play around in the browser console.
+<a href="https://github.com/agershun/alasql/graphs/contributors">
+  <img src="https://contributors-img.web.app/image?repo=agershun/alasql" />
+</a>
 
 
 ## License

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v1.7.3-develop-0be167bcundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v1.7.4-develop-89075a50undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 1.7.3-develop-0be167bcundefined
+@version 1.7.4-develop-89075a50undefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v1.7.3-develop-0be167bcundefined | © 2014-2018 Andrey Gershun & Mathias Rangel 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,t){"function"==typeof(e=e||[])&&(scope=t,t=e,e=[]),"object"!=typeof e&&(e=[e]);var o=i.lastid++;i.buffer[o]=t,i.webworker.postMessage({id:o,sql:r,params:e})}var s;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&&(s=function(r,e,n,s){return new Promise(function(t,o){i(r,e,function(r,e){e?o(e):(n&&s&&!1!==i.options.progress&&i.options.progress(n,s),t(r))})})},i.promise=function(r,e){if("undefined"==typeof Promise)throw new Error("Please include a Promise/A+ library");if("string"==typeof r)return s(r,e);if(!isArray(r)||r.length<1||void 0!==e)throw new Error("Error in .promise parameters");return function(r){if(!(r.length<1)){for(var e,t,o=[],n=0;n<r.length;n++){if("string"==typeof(t=r[n])&&(t=[t]),!isArray(t)||t.length<1||2<t.length)throw new Error("Error in .promise parameter");e=t[0],t=t[1]||void 0,o.push(s(e,t,n,r.length))}return Promise.all(o)}}(r)}),!(i=i||!1))throw new Error("alasql was not found");return i.worker=function(){throw new Error("Can find webworker in this enviroment")},"undefined"!=typeof Worker&&(i.worker=function(r,e,t){if(void 0===(r=!0===r?void 0:r))for(var o=document.getElementsByTagName("script"),n=0;n<o.length;n++){if("alasql-worker.js"===o[n].src.substr(-16).toLowerCase()){r=o[n].src.substr(0,o[n].src.length-16)+"alasql.js";break}if("alasql-worker.min.js"===o[n].src.substr(-20).toLowerCase()){r=o[n].src.substr(0,o[n].src.length-20)+"alasql.min.js";break}if("alasql.js"===o[n].src.substr(-9).toLowerCase()){r=o[n].src;break}if("alasql.min.js"===o[n].src.substr(-13).toLowerCase()){r=o[n].src.substr(0,o[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="importScripts('",s+=r,s+="');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(","),[],t)):!1===r&&delete i.webworker}),i.lastid=0,i.buffer={},i.worker(),i});
+//! AlaSQL v1.7.4-develop-89075a50undefined | © 2014-2018 Andrey Gershun & Mathias Rangel 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 v1.7.3-develop-0be167bcundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v1.7.4-develop-89075a50undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 1.7.3-develop-0be167bcundefined
+@version 1.7.4-develop-89075a50undefined
 
 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 = '1.7.3-develop-0be167bcundefined';
+alasql.version = '1.7.4-develop-89075a50undefined';
 
 /**
 	Debug flag
@@ -4328,12 +4328,6 @@ var getXLSX = function () {
 	return XLSX;
 };
 
-var jss = JSON.stringify;
-var reName = /[^a-z\d@-_]+/gi;
-var nss = (e) => e.replace(reName, '');
-var reTick = /`/g;
-var tss = (e) => e.replace(reTick, '');
-
 // set AlaSQl path
 alasql.path = alasql.utils.findAlaSQLPath();
 
@@ -6314,7 +6308,7 @@ yy.Search.prototype.toString = function () {
 
 yy.Search.prototype.toJS = function (context) {
 
-	var s = 'this.queriesfn[' + jss(this.queriesidx - 1) + '](this.params,null,' + jss(context) + ')';
+	var s = 'this.queriesfn[' + (this.queriesidx - 1) + '](this.params,null,' + context + ')';
 	// var s = '';
 	return s;
 };
@@ -6675,11 +6669,11 @@ alasql.srch.SET = function (val, args, stope, params) {
 		.map(function (st) {
 
 			if (st.method === '@') {
-				return 'alasql.vars[' + jss(st.variable) + ']=' + st.expression.toJS('x', '');
+				return "alasql.vars['" + st.variable + "']=" + st.expression.toJS('x', '');
 			} else if (st.method === '$') {
-				return 'params[' + jss(st.variable) + ']=' + st.expression.toJS('x', '');
+				return "params['" + st.variable + "']=" + st.expression.toJS('x', '');
 			} else {
-				return 'x[' + jss(st.column.columnid) + ']=' + st.expression.toJS('x', '');
+				return "x['" + st.column.columnid + "']=" + st.expression.toJS('x', '');
 			}
 		})
 		.join(';');
@@ -6766,26 +6760,17 @@ var compileSearchOrder = function (order) {
 					s += 'if(a' + dg + '==b' + dg + '){';
 				} else {
 					s +=
-						'if((a[' +
-						jss(columnid) +
-						"]||'')" +
+						"if((a['" +
+						columnid +
+						"']||'')" +
 						dg +
 						(ord.direction === 'ASC' ? '>' : '<') +
-						'(b[' +
-						jss(columnid) +
-						"]||'')" +
+						"(b['" +
+						columnid +
+						"']||'')" +
 						dg +
 						')return 1;';
-					s +=
-						'if((a[' +
-						jss(columnid) +
-						"]||'')" +
-						dg +
-						'==(b[' +
-						jss(columnid) +
-						"]||'')" +
-						dg +
-						'){';
+					s += "if((a['" + columnid + "']||'')" + dg + "==(b['" + columnid + "']||'')" + dg + '){';
 				}
 			} else {
 				dg = '.valueOf()';
@@ -17190,7 +17175,8 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 			var colm = 1,
 				rowm = 1;
 		}
-		var colmax = Math.max(col0 + columns.length, colm);
+		var zeroColumnFix = columns.length ? 0 : 1;
+		var colmax = Math.max(col0 + columns.length - 1 + zeroColumnFix, colm);
 		var rowmax = Math.max(row0 + dataLength + 2, rowm);
 
 		var i = row0 + 1;
@@ -18779,7 +18765,6 @@ LS.dropDatabase = function (lsdbid, ifexists, cb) {
 
 LS.attachDatabase = function (lsdbid, databaseid, args, params, cb) {
 	var res = 1;
-	//	console.warn({lsdbid, databaseid, args, params, cb, dbs: Object.keys(alasql.databases)})
 	if (alasql.databases[databaseid]) {
 		throw new Error('Unable to attach database as "' + databaseid + '" because it already exists');
 	}

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v1.7.3-develop-0be167bcundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v1.7.4-develop-89075a50undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 1.7.3-develop-0be167bcundefined
+@version 1.7.4-develop-89075a50undefined
 
 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 = '1.7.3-develop-0be167bcundefined';
+alasql.version = '1.7.4-develop-89075a50undefined';
 
 /**
 	Debug flag
@@ -4323,12 +4323,6 @@ var getXLSX = function () {
 	return XLSX;
 };
 
-var jss = JSON.stringify;
-var reName = /[^a-z\d@-_]+/gi;
-var nss = (e) => e.replace(reName, '');
-var reTick = /`/g;
-var tss = (e) => e.replace(reTick, '');
-
 // set AlaSQl path
 alasql.path = alasql.utils.findAlaSQLPath();
 
@@ -6309,7 +6303,7 @@ yy.Search.prototype.toString = function () {
 
 yy.Search.prototype.toJS = function (context) {
 
-	var s = 'this.queriesfn[' + jss(this.queriesidx - 1) + '](this.params,null,' + jss(context) + ')';
+	var s = 'this.queriesfn[' + (this.queriesidx - 1) + '](this.params,null,' + context + ')';
 	// var s = '';
 	return s;
 };
@@ -6670,11 +6664,11 @@ alasql.srch.SET = function (val, args, stope, params) {
 		.map(function (st) {
 
 			if (st.method === '@') {
-				return 'alasql.vars[' + jss(st.variable) + ']=' + st.expression.toJS('x', '');
+				return "alasql.vars['" + st.variable + "']=" + st.expression.toJS('x', '');
 			} else if (st.method === '$') {
-				return 'params[' + jss(st.variable) + ']=' + st.expression.toJS('x', '');
+				return "params['" + st.variable + "']=" + st.expression.toJS('x', '');
 			} else {
-				return 'x[' + jss(st.column.columnid) + ']=' + st.expression.toJS('x', '');
+				return "x['" + st.column.columnid + "']=" + st.expression.toJS('x', '');
 			}
 		})
 		.join(';');
@@ -6761,26 +6755,17 @@ var compileSearchOrder = function (order) {
 					s += 'if(a' + dg + '==b' + dg + '){';
 				} else {
 					s +=
-						'if((a[' +
-						jss(columnid) +
-						"]||'')" +
+						"if((a['" +
+						columnid +
+						"']||'')" +
 						dg +
 						(ord.direction === 'ASC' ? '>' : '<') +
-						'(b[' +
-						jss(columnid) +
-						"]||'')" +
+						"(b['" +
+						columnid +
+						"']||'')" +
 						dg +
 						')return 1;';
-					s +=
-						'if((a[' +
-						jss(columnid) +
-						"]||'')" +
-						dg +
-						'==(b[' +
-						jss(columnid) +
-						"]||'')" +
-						dg +
-						'){';
+					s += "if((a['" + columnid + "']||'')" + dg + "==(b['" + columnid + "']||'')" + dg + '){';
 				}
 			} else {
 				dg = '.valueOf()';
@@ -17185,7 +17170,8 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 			var colm = 1,
 				rowm = 1;
 		}
-		var colmax = Math.max(col0 + columns.length, colm);
+		var zeroColumnFix = columns.length ? 0 : 1;
+		var colmax = Math.max(col0 + columns.length - 1 + zeroColumnFix, colm);
 		var rowmax = Math.max(row0 + dataLength + 2, rowm);
 
 		var i = row0 + 1;
@@ -18774,7 +18760,6 @@ LS.dropDatabase = function (lsdbid, ifexists, cb) {
 
 LS.attachDatabase = function (lsdbid, databaseid, args, params, cb) {
 	var res = 1;
-	//	console.warn({lsdbid, databaseid, args, params, cb, dbs: Object.keys(alasql.databases)})
 	if (alasql.databases[databaseid]) {
 		throw new Error('Unable to attach database as "' + databaseid + '" because it already exists');
 	}