alasql 4.1.3 → 4.1.5

package/README.md

@@ -7,11 +7,11 @@
 [![OPEN open source software](https://img.shields.io/badge/Open--OSS-%E2%9C%94-brightgreen.svg)](http://open-oss.com)
 [![Release](https://img.shields.io/github/release/alasql/alasql.svg?label=npm&a)](https://www.npmjs.com/package/alasql)
 [![Stars](https://img.shields.io/github/stars/alasql/alasql.svg?label=Github%20%E2%98%85&a)](https://github.com/alasql/alasql)
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/alasql/alasql.svg)](http://isitmaintained.com/project/\n/alasql "Average time to resolve an issue")
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/AlaSQL/alasql.svg)](http://isitmaintained.com/project/AlaSQL/alasql "Average time to resolve an issue")
 [![Coverage]( https://img.shields.io/codecov/c/github/alasql/alasql/develop.svg)](https://rawgit.com/alasql/alasql/develop/test/coverage/lcov-report/dist/alasql.fs.js.html)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/328/badge)](https://bestpractices.coreinfrastructure.org/projects/328)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/AlaSQL/alasql/badge)](https://securityscorecards.dev/viewer/?uri=github.com/AlaSQL/alasql)
+[![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/328/badge)](https://bestpractices.coreinfrastructure.org/projects/328)
 [![](https://data.jsdelivr.com/v1/package/npm/alasql/badge?style=rounded)](https://www.jsdelivr.com/package/npm/alasql)
-[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat)](https://github.com/prettier/prettier)
 
 
 

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.2 build: develop-c4d7c946 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.4 build: develop-b2979cbc | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.2
+@version 4.1.4
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff

package/dist/alasql-worker.min.js

@@ -1,2 +1,2 @@
-//! AlaSQL v4.1.2 build: develop-c4d7c946 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.4 build: develop-b2979cbc | © 2014-2023 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.d.ts

@@ -60,17 +60,28 @@ declare module 'alasql' {
 	interface userDefinedFunction {
 		(...x: any[]): any;
 	}
+
 	interface userDefinedFunctionLookUp {
 		[x: string]: userDefinedFunction;
 	}
+
 	// see https://github.com/alasql/alasql/wiki/User%20Defined%20Functions
 	interface userAggregator {
 		(value: any, accumulator: any, stage: number): any;
 	}
+
 	interface userAggregatorLookUp {
 		[x: string]: userAggregator;
 	}
 
+	interface userFromFunction {
+		(dataReference: any, options: any, callback: any, index: any, query: any): any;
+	}
+
+	interface userFromFunctionLookUp {
+		[x: string]: userFromFunction;
+	}
+
 	interface AlaSQL {
 		options: AlaSQLOptions;
 		error: Error;
@@ -78,11 +89,14 @@ declare module 'alasql' {
 		parse(sql: any): AlaSQLAST;
 		promise(sql: any, params?: any): Thenable<any>;
 		fn: userDefinedFunctionLookUp;
+		from: userFromFunctionLookUp;
 		aggr: userAggregatorLookUp;
 		autoval(tablename: string, colname: string, getNext?: boolean): number;
 		yy: {};
 		setXLSX(xlsxlib: typeof xlsx): void;
 	}
+
 	const alasql: AlaSQL;
+
 	export = alasql;
 }

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.2 build: develop-c4d7c946 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.4 build: develop-b2979cbc | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.2
+@version 4.1.4
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -142,8 +142,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '4.1.2';
-alasql.build = 'develop-c4d7c946';
+alasql.version = '4.1.4';
+alasql.build = 'develop-b2979cbc';
 
 /**
 	Debug flag
@@ -3490,7 +3490,7 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 			});
 		} else {
 			if (/^[a-z]+:\/\//i.test(path)) {
-				fetchData(path, (x) => success(cutbom(x)), error, asy);
+				fetchData(path, x => success(cutbom(x)), error, asy);
 			} else {
 				//If async callthen call async
 				if (asy) {
@@ -3553,7 +3553,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');
 				 */
-				fetchData(path, (x) => success(cutbom(x)), error, asy);
+				fetchData(path, x => success(cutbom(x)), error, asy);
 			}
 		} else if (path instanceof Event) {
 			/*
@@ -3594,13 +3594,13 @@ async function fetchData(path, success, error, async) {
 
 function getData(path, success, error) {
 	return _fetch(path)
-		.then((response) => response.arrayBuffer())
-		.then((buf) => {
+		.then(response => response.arrayBuffer())
+		.then(buf => {
 			var a = new Uint8Array(buf);
-			var b = [...a].map((e) => String.fromCharCode(e)).join('');
+			var b = [...a].map(e => String.fromCharCode(e)).join('');
 			success(b);
 		})
-		.catch((e) => {
+		.catch(e => {
 			if (error) return error(e);
 			console.error(e);
 			throw e;
@@ -3622,7 +3622,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (
 	path,
 	runAsync,
 	success,
-	error = (x) => {
+	error = x => {
 		throw x;
 	}
 ) {
@@ -4866,9 +4866,9 @@ 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])
+	promiseData.forEach(p => {
+		startingPoint = startingPoint.then(previousResult =>
+			promiseExec(p.sql, p.params, p.i, p.length).then(result => [...previousResult, result])
 		);
 	});
 
@@ -5272,16 +5272,16 @@ yy.Statements = class Statements {
 	}
 
 	toString() {
-		return this.statements.map((st) => st.toString()).join('; ');
+		return this.statements.map(st => st.toString()).join('; ');
 	}
 
 	// Compile array of statements into single statement
 	compile(db) {
-		const statements = this.statements.map((st) => st.compile(db));
+		const statements = this.statements.map(st => st.compile(db));
 		return statements.length === 1
 			? statements[0]
 			: (params, cb) => {
-					const res = statements.map((st) => st(params));
+					const res = statements.map(st => st(params));
 					if (cb) cb(res);
 					return res;
 			  };
@@ -5973,7 +5973,7 @@ alasql.srch = {
 	PROP(val, args, stope) {
 
 		if (stope.mode === 'XML') {
-			const values = val.children.filter((v) => v.name.toUpperCase() === args[0].toUpperCase());
+			const values = val.children.filter(v => v.name.toUpperCase() === args[0].toUpperCase());
 
 			return {
 				status: values.length ? 1 : -1,
@@ -6311,7 +6311,7 @@ alasql.srch = {
 
 	ROW(val, args, stope, params) {
 		var s = 'var y;return [';
-		s += args.map((arg) => arg.toJS('x', '')).join(',');
+		s += args.map(arg => arg.toJS('x', '')).join(',');
 		s += ']';
 		var setfn = new Function('x,params,alasql', s);
 		var rv = setfn(val, params, alasql);
@@ -6481,7 +6481,7 @@ function queryfn(query, oldscope, cb, A, B) {
 
 	// First - refresh data sources
 
-	var result;
+	let result;
 	query.sources.forEach(function (source, idx) {
 		//		source.data = query.database.tables[source.tableid].data;
 
@@ -6502,7 +6502,14 @@ function queryfn(query, oldscope, cb, A, B) {
 		//
 		source.queriesdata = query.queriesdata;
 	});
-	if (query.sources.length == 0 || 0 === slen) result = queryfn3(query);
+	if (query.sources.length == 0 || 0 === slen) {
+		try {
+			result = queryfn3(query);
+		} catch (e) {
+			if (cb) return cb(null, e);
+			else throw e;
+		}
+	}
 
 	return result;
 }
@@ -7551,8 +7558,8 @@ yy.Select = class Select {
 								.intoTable(
 									${JSON.stringify(this.into.databaseid || databaseid)},
 									${JSON.stringify(this.into.tableid)},
-									this.data, 
-									columns, 
+									this.data,
+									columns,
 									cb
 								);`;
 				} else {
@@ -7619,7 +7626,7 @@ yy.Select = class Select {
 			// the (data, err) standard is maintained here.
 			var res1 = queryfn(query, oldscope, function (res, err) {
 				if (err) {
-					return cb(err, null);
+					return cb(null, err);
 				}
 				if (query.rownums.length > 0) {
 					for (var i = 0, ilen = res.length; i < ilen; i++) {
@@ -8625,9 +8632,6 @@ yy.Select.prototype.compileGroup = function (query) {
 	query.allgroups = allgroups;
 
 	query.ingroup = [];
-
-	// Create negative array
-
 	var s = '';
 	//	s+= query.selectfns;
 	allgroup.forEach(function (agroup) {
@@ -8700,7 +8704,7 @@ yy.Select.prototype.compileGroup = function (query) {
 				// 	if(col instanceof yy.Column) colas = col.columnid;
 				// 	else colas = col.toString();
 				// };
-				let colExpIfFunIdExists = (expression) => {
+				let colExpIfFunIdExists = expression => {
 					let colexpression = expression.args[0];
 					return colexpression.toJS('p', tableid, defcols);
 				};
@@ -8811,21 +8815,13 @@ yy.Select.prototype.compileGroup = function (query) {
 
 		s += '}' + aft + ',g));' + aft2 + '} else {';
 
-		/*
-	// var neggroup = arrayDiff(allgroups,agroup);
-
-	// s += neggroup.map(function(columnid){
-	// 	return "g['"+columnid+"']=null;";
-	// }).join('');
-*/
-
 		//		s += self.columns.map(function(col){
 		s += query.selectGroup
 			.map(function (col) {
 				var colas = col.nick;
 
 				var colexp = col.expression.toJS('p', tableid, defcols);
-				let colExpIfFunIdExists = (expression) => {
+				let colExpIfFunIdExists = expression => {
 					let colexpression = expression.args[0];
 					return colexpression.toJS('p', tableid, defcols);
 				};
@@ -11665,7 +11661,7 @@ stdlib.UPPER = stdlib.UCASE = function (s) {
 // Concatination of strings
 stdfn.CONCAT_WS = function () {
 	var args = Array.prototype.slice.call(arguments);
-	args = args.filter((x) => !(x === null || typeof x === 'undefined'));
+	args = args.filter(x => !(x === null || typeof x === 'undefined'));
 	return args.slice(1, args.length).join(args[0] || '');
 };
 
@@ -12601,7 +12597,11 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			};
 		}
 		if (checkfn) {
-			table.checks.push({fn: checkfn, id: con.constraintid, fk: con.type === 'FOREIGN KEY'});
+			table.checks.push({
+				fn: checkfn,
+				id: con.constraintid,
+				fk: con.type === 'FOREIGN KEY',
+			});
 		}
 	});
 
@@ -13991,7 +13991,9 @@ yy.WithSelect.prototype.execute = function (databaseid, params, cb) {
 	var savedTables = [];
 	self.withs.forEach(function (w) {
 		savedTables.push(alasql.databases[databaseid].tables[w.name]);
-		var tb = (alasql.databases[databaseid].tables[w.name] = new Table({tableid: w.name}));
+		var tb = (alasql.databases[databaseid].tables[w.name] = new Table({
+			tableid: w.name,
+		}));
 		tb.data = w.select.execute(databaseid, params);
 	});
 
@@ -15240,7 +15242,11 @@ yy.ShowColumns.prototype.execute = function (databaseid, params, cb) {
 
 	if (table && table.columns) {
 		var res = table.columns.map(function (col) {
-			return {columnid: col.columnid, dbtypeid: col.dbtypeid, dbsize: col.dbsize};
+			return {
+				columnid: col.columnid,
+				dbtypeid: col.dbtypeid,
+				dbsize: col.dbsize,
+			};
 		});
 		if (cb) cb(res);
 		return res;
@@ -16898,7 +16904,9 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 
 		if (opt.headers) {
 			columns.forEach(function (col, idx) {
-				cells[alasql.utils.xlsnc(col0 + idx) + '' + i] = {v: col.columnid.trim()};
+				cells[alasql.utils.xlsnc(col0 + idx) + '' + i] = {
+					v: col.columnid.trim(),
+				};
 			});
 			i++;
 		}
@@ -17331,9 +17339,17 @@ function XLSXLSX(X, filename, opts, cb, idx, query) {
 			//	function processData(data) {
 			if (data instanceof ArrayBuffer) {
 				var arr = fixdata(data);
-				var workbook = X.read(btoa(arr), {type: 'base64', ...alasql.options.excel, ...opts});
+				var workbook = X.read(btoa(arr), {
+					type: 'base64',
+					...alasql.options.excel,
+					...opts,
+				});
 			} else {
-				var workbook = X.read(data, {type: 'binary', ...alasql.options.excel, ...opts});
+				var workbook = X.read(data, {
+					type: 'binary',
+					...alasql.options.excel,
+					...opts,
+				});
 			}
 
 			var sheetid;
@@ -17851,7 +17867,7 @@ async function _databaseExists(name) {
 
 	if (indexedDB.databases) {
 		const dbs = await indexedDB.databases();
-		const db = dbs.find((db) => db.name === name);
+		const db = dbs.find(db => db.name === name);
 		// @ts-ignore
 		return db || 0;
 	}
@@ -17865,7 +17881,7 @@ async function _databaseExists(name) {
 			resolve({name, version: req.result.version});
 		};
 
-		req.onupgradeneeded = (evt) => {
+		req.onupgradeneeded = evt => {
 			evt.target.transaction.abort();
 			resolve(0);
 		};
@@ -17890,7 +17906,7 @@ IDB.showDatabases = function (like, cb) {
 		return;
 	}
 
-	indexedDB.databases().then((dblist) => {
+	indexedDB.databases().then(dblist => {
 		const res = [];
 		const relike = like && new RegExp(like.value.replace(/\%/g, '.*'), 'g');
 
@@ -17905,7 +17921,7 @@ IDB.showDatabases = function (like, cb) {
 };
 
 IDB.createDatabase = async function (ixdbid, args, ifnotexists, dbid, cb) {
-	const found = await _databaseExists(ixdbid).catch((err) => {
+	const found = await _databaseExists(ixdbid).catch(err => {
 		if (cb) cb(null, err);
 		throw err;
 	});
@@ -17929,7 +17945,7 @@ IDB.createDatabase = async function (ixdbid, args, ifnotexists, dbid, cb) {
 };
 
 IDB.dropDatabase = async function (ixdbid, ifexists, cb) {
-	const found = await _databaseExists(ixdbid).catch((err) => {
+	const found = await _databaseExists(ixdbid).catch(err => {
 		if (cb) cb(null, err);
 		throw err;
 	});
@@ -17953,7 +17969,7 @@ IDB.dropDatabase = async function (ixdbid, ifexists, cb) {
 };
 
 IDB.attachDatabase = async function (ixdbid, dbid, args, params, cb) {
-	const found = await _databaseExists(ixdbid).catch((err) => {
+	const found = await _databaseExists(ixdbid).catch(err => {
 		if (cb) cb(null, err);
 		throw err;
 	});
@@ -17988,7 +18004,7 @@ IDB.attachDatabase = async function (ixdbid, dbid, args, params, cb) {
 
 IDB.createTable = async function (databaseid, tableid, ifnotexists, cb) {
 	const ixdbid = alasql.databases[databaseid].ixdbid;
-	const found = await _databaseExists(ixdbid).catch((err) => {
+	const found = await _databaseExists(ixdbid).catch(err => {
 		if (cb) cb(null, err);
 		throw err;
 	});
@@ -18009,7 +18025,7 @@ IDB.createTable = async function (databaseid, tableid, ifnotexists, cb) {
 		request.result.close();
 		if (cb) cb(1);
 	};
-	request.onerror = (evt) => {
+	request.onerror = evt => {
 		cb(null, evt);
 	};
 	request.onblocked = function (event) {
@@ -18022,7 +18038,7 @@ IDB.createTable = async function (databaseid, tableid, ifnotexists, cb) {
 
 IDB.dropTable = async function (databaseid, tableid, ifexists, cb) {
 	const ixdbid = alasql.databases[databaseid].ixdbid;
-	const found = await _databaseExists(ixdbid).catch((err) => {
+	const found = await _databaseExists(ixdbid).catch(err => {
 		if (cb) cb(null, err);
 		throw err;
 	});
@@ -18071,7 +18087,7 @@ IDB.intoTable = function (databaseid, tableid, value, columns, cb) {
 	var db = alasql.databases[databaseid];
 	var table = db.tables[tableid];
 
-	request.onupgradeneeded = (evt) => {
+	request.onupgradeneeded = evt => {
 		evt.target.transaction.abort();
 		const err = new Error(
 			`Cannot insert into table "${tableid}" because database "${databaseid}" does not exist`
@@ -18107,7 +18123,7 @@ IDB.fromTable = function (databaseid, tableid, cb, idx, query) {
 	const ixdbid = alasql.databases[databaseid].ixdbid;
 	const request = indexedDB.open(ixdbid);
 
-	request.onupgradeneeded = (evt) => {
+	request.onupgradeneeded = evt => {
 		evt.target.transaction.abort();
 		const err = new Error(
 			`Cannot select from table "${tableid}" because database "${databaseid}" does not exist`
@@ -18124,7 +18140,7 @@ IDB.fromTable = function (databaseid, tableid, cb, idx, query) {
 			const cursor = cur.result;
 			if (cursor) {
 				// if keyPath(columns) is not present then we take the key and value as object.
-				const cursorValue = typeof cursor === Object ? cursor.value : { [cursor.key]: cursor.value };
+				const cursorValue = typeof cursor === Object ? cursor.value : {[cursor.key]: cursor.value};
 				res.push(cursorValue);
 				cursor.continue();
 			} else {
@@ -19163,7 +19179,9 @@ var saveAs =
 						blob.type
 					)
 				) {
-					return new Blob([String.fromCharCode(0xfeff), blob], {type: blob.type});
+					return new Blob([String.fromCharCode(0xfeff), blob], {
+						type: blob.type,
+					});
 				}
 				return blob;
 			},