alasql 4.1.2 → 4.1.3

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.1.1 build: develop-a17cafee | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.1.2 build: develop-c4d7c946 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.1.1
+@version 4.1.2
 
 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.1';
-alasql.build = 'develop-a17cafee';
+alasql.version = '4.1.2';
+alasql.build = 'develop-c4d7c946';
 
 /**
 	Debug flag
@@ -4955,7 +4955,7 @@ var Database = (alasql.Database = function (databaseid) {
 			alasql.databases[databaseid] = self;
 			//			}
 			if (!self) {
-				throw new Error('Database "' + databaseid + '" not found');
+				throw new Error(`Database ${databaseid} not found`);
 			}
 		} else {
 			// Create new database (or get alasql?)
@@ -5351,10 +5351,6 @@ yy.Search = class Search {
 				r, // temp value used many places
 				sel = selectors[sidx];
 
-			//		if(!alasql.srch[sel.srchid]) {
-			//			throw new Error('Selector "'+sel.srchid+'" not found');
-			//		};
-
 			var INFINITE_LOOP_BREAK = alasql.options.loopbreak || 100000;
 
 			if (sel.selid) {
@@ -6297,13 +6293,12 @@ alasql.srch = {
 
 		var s = args
 			.map(function (st) {
-
 				if (st.method === '@') {
-					return "alasql.vars['" + st.variable + "']=" + st.expression.toJS('x', '');
+					return `alasql.vars[${JSON.stringify(st.variable)}]=` + st.expression.toJS('x', '');
 				} else if (st.method === '$') {
-					return "params['" + st.variable + "']=" + st.expression.toJS('x', '');
+					return `params[${JSON.stringify(st.variable)}]=` + st.expression.toJS('x', '');
 				} else {
-					return "x['" + st.column.columnid + "']=" + st.expression.toJS('x', '');
+					return `x[${JSON.stringify(st.column.columnid)}]=` + st.expression.toJS('x', '');
 				}
 			})
 			.join(';');
@@ -6382,18 +6377,18 @@ var compileSearchOrder = function (order) {
 					s += 'if(a' + dg + (ord.direction === 'ASC' ? '>' : '<') + 'b' + dg + ')return 1;';
 					s += 'if(a' + dg + '==b' + dg + '){';
 				} else {
-					s +=
-						"if((a['" +
-						columnid +
-						"']||'')" +
-						dg +
-						(ord.direction === 'ASC' ? '>' : '<') +
-						"(b['" +
-						columnid +
-						"']||'')" +
-						dg +
-						')return 1;';
-					s += "if((a['" + columnid + "']||'')" + dg + "==(b['" + columnid + "']||'')" + dg + '){';
+					s += `if (
+							(a[${JSON.stringify(columnid)}]||'')${dg}
+							${ord.direction === 'ASC' ? '>' : '<'}
+							(b[${JSON.stringify(columnid)}]||'')${dg} 
+						) return 1;
+
+						if(
+							(a[${JSON.stringify(columnid)}]||'')${dg}
+							==
+							(b[${JSON.stringify(columnid)}]||'')${dg}
+						){
+						`;
 				}
 			} else {
 				dg = '.valueOf()';
@@ -6596,23 +6591,16 @@ function queryfn3(query) {
 		if (query.aggrKeys.length > 0) {
 			var gfns = '';
 			query.aggrKeys.forEach(function (col) {
-				gfns +=
-					"g['" +
-					col.nick +
-					"']=alasql.aggr['" +
-					col.funcid +
-					"'](undefined,g['" +
-					col.nick +
-					"'],3);";
+				gfns += `g[${JSON.stringify(col.nick)}] = alasql.aggr[${JSON.stringify(
+					col.funcid
+				)}](undefined,g[${JSON.stringify(col.nick)}],3);`;
+
 				//				gfns += 'return g[\''+col.nick+'\];';
 			});
 
 			var gfn = new Function('g,params,alasql', 'var y;' + gfns);
 		}
 
-		//					return "'"+colas+'\':alasql.aggr[\''+col.funcid+'\']('+colexp+',undefined,(acc={}),1),'
-		//					+'\'__REDUCE__'+colas+'\':acc,';
-
 		// *******
 
 		// 	debugger;
@@ -7558,34 +7546,34 @@ yy.Select = class Select {
 					alasql.databases[this.into.databaseid || databaseid].engineid
 				) {
 					// For external database when AUTOCOMMIT is ONs
-					query.intoallfns =
-						'return alasql.engines["' +
-						alasql.databases[this.into.databaseid || databaseid].engineid +
-						'"]' +
-						'.intoTable("' +
-						(this.into.databaseid || databaseid) +
-						'","' +
-						this.into.tableid +
-						'",this.data, columns, cb);';
+					query.intoallfns = `return alasql
+								.engines[${JSON.stringify(alasql.databases[this.into.databaseid || databaseid].engineid)}]
+								.intoTable(
+									${JSON.stringify(this.into.databaseid || databaseid)},
+									${JSON.stringify(this.into.tableid)},
+									this.data, 
+									columns, 
+									cb
+								);`;
 				} else {
 					// Into AlaSQL tables
-					query.intofns =
-						"alasql.databases['" +
-						(this.into.databaseid || databaseid) +
-						"'].tables" +
-						"['" +
-						this.into.tableid +
-						"'].data.push(r);";
+					query.intofns = `alasql
+							.databases[${JSON.stringify(this.into.databaseid || databaseid)}]
+							.tables[${JSON.stringify(this.into.tableid)}]
+							.data.push(r);
+						`;
 				}
 			} else if (this.into instanceof yy.VarValue) {
 				//
 				// Save into local variable
 				// SELECT * INTO @VAR1 FROM ?
 				//
-				query.intoallfns =
-					'alasql.vars["' +
-					this.into.variable +
-					'"]=this.data;res=this.data.length;if(cb)res=cb(res);return res;';
+				query.intoallfns = `
+					alasql.vars[${JSON.stringify(this.into.variable)}]=this.data;
+					res=this.data.length;
+					if(cb) res = cb(res);
+					return res;
+				`;
 			} else if (this.into instanceof yy.FuncValue) {
 				//
 				// If this is INTO() function, then call it
@@ -7609,7 +7597,7 @@ yy.Select = class Select {
 				// Save data into parameters array
 				// like alasql('SELECT * INTO ? FROM ?',[outdata,srcdata]);
 				//
-				query.intofns = "params['" + this.into.param + "'].push(r)";
+				query.intofns = `params[${JSON.stringify(this.into.param)}].push(r)`;
 			}
 
 			if (query.intofns) {
@@ -12462,14 +12450,14 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			}
 
 			if (col.default) {
-				ss.push("'" + col.columnid + "':" + col.default.toJS('r', ''));
+				ss.push(JSON.stringify('' + col.columnid) + ':' + col.default.toJS('r', ''));
 			}
 
 			// Check for primary key
 			if (col.primarykey) {
 				var pk = (table.pk = {});
 				pk.columns = [col.columnid];
-				pk.onrightfns = "r['" + col.columnid + "']";
+				pk.onrightfns = `r[${JSON.stringify(col.columnid)}]`;
 				pk.onrightfn = new Function('r', 'var y;return ' + pk.onrightfns);
 				pk.hh = hash(pk.onrightfns);
 				table.uniqs[pk.hh] = {};
@@ -12481,7 +12469,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 				table.uk = table.uk || [];
 				table.uk.push(uk);
 				uk.columns = [col.columnid];
-				uk.onrightfns = "r['" + col.columnid + "']";
+				uk.onrightfns = `r[${JSON.stringify(col.columnid)}]`;
 				uk.onrightfn = new Function('r', 'var y;return ' + uk.onrightfns);
 				uk.hh = hash(uk.onrightfns);
 				table.uniqs[uk.hh] = {};
@@ -12510,10 +12498,6 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 
 					if (!fktable.uniqs[fktable.pk.hh][addr]) {
 						throw new Error(
-							// 							'Foreign key "' +
-							// 								r[col.columnid] +
-							// 								'" is not found in table ' +
-							// 								fktable.tableid
 							'Foreign key violation' //changed error message
 						);
 					}
@@ -12524,7 +12508,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			}
 
 			if (col.onupdate) {
-				uss.push("r['" + col.columnid + "']=" + col.onupdate.toJS('r', ''));
+				uss.push(`r[${JSON.stringify(col.columnid)}]=` + col.onupdate.toJS('r', ''));
 			}
 
 			table.columns.push(newcol);
@@ -12547,7 +12531,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			pk.columns = con.columns;
 			pk.onrightfns = pk.columns
 				.map(function (columnid) {
-					return "r['" + columnid + "']";
+					return `r[${JSON.stringify(columnid)}]`;
 				})
 				.join("+'`'+");
 			pk.onrightfn = new Function('r', 'var y;return ' + pk.onrightfns);
@@ -12564,7 +12548,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			uk.columns = con.columns;
 			uk.onrightfns = uk.columns
 				.map(function (columnid) {
-					return "r['" + columnid + "']";
+					return `r[${JSON.stringify(columnid)}]`;
 				})
 				.join("+'`'+");
 			uk.onrightfn = new Function('r', 'var y;return ' + uk.onrightfns);
@@ -13198,7 +13182,9 @@ yy.DropTable.prototype.execute = function (databaseid, params, cb) {
 			if (!db.tables[tableid]) {
 				if (!alasql.options.dropifnotexists) {
 					throw new Error(
-						"Can not drop table '" + table.tableid + "', because it does not exist in the database."
+						`Can not drop table ${JSON.strnigify(
+							table.tableid
+						)} because it does not exist in the database.`
 					);
 				}
 			} else {
@@ -13312,7 +13298,7 @@ yy.CreateVertex.prototype.compile = function (databaseid) {
 	if (this.sets && this.sets.length > 0) {
 		var s = this.sets
 			.map(function (st) {
-				return "x['" + st.column.columnid + "']=" + st.expression.toJS('x', '');
+				return `x[${JSON.stringify(st.column.columnid)}]=` + st.expression.toJS('x', '');
 			})
 			.join(';');
 		var setfn = new Function('x,params,alasql', s);
@@ -13385,7 +13371,7 @@ yy.CreateEdge.prototype.compile = function (databaseid) {
 	if (this.sets && this.sets.length > 0) {
 		var s = this.sets
 			.map(function (st) {
-				return "x['" + st.column.columnid + "']=" + st.expression.toJS('x', '');
+				return `x[${JSON.stringify(st.column.columnid)}]=` + st.expression.toJS('x', '');
 			})
 			.join(';');
 		var setfn = new Function('x,params,alasql', 'var y;' + s);
@@ -13651,7 +13637,7 @@ yy.CreateGraph.prototype.compile1 = function (databaseid) {
 	if (this.sets && this.sets.length > 0) {
 		var s = this.sets
 			.map(function (st) {
-				return "x['" + st.column.columnid + "']=" + st.expression.toJS('x', '');
+				return `x[${JSON.stringify(st.column.columnid)}]=` + st.expression.toJS('x', '');
 			})
 			.join(';');
 		var setfn = new Function('x,params,alasql', 'var y;' + s);
@@ -13726,14 +13712,10 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 		var res = 1;
 		if (db.tables[newtableid]) {
 			throw new Error(
-				"Can not rename a table '" +
-					oldtableid +
-					"' to '" +
-					newtableid +
-					"', because the table with this name already exists"
+				`Can not rename a table "${oldtableid}" to "${newtableid}" because the table with this name already exists`
 			);
 		} else if (newtableid === oldtableid) {
-			throw new Error("Can not rename a table '" + oldtableid + "' to itself");
+			throw new Error(`Can not rename a table "${oldtableid}" to itself`);
 		} else {
 			db.tables[newtableid] = db.tables[oldtableid];
 			delete db.tables[oldtableid];
@@ -13749,11 +13731,7 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 		var columnid = this.addcolumn.columnid;
 		if (table.xcolumns[columnid]) {
 			throw new Error(
-				'Cannot add column "' +
-					columnid +
-					'", because it already exists in the table "' +
-					tableid +
-					'"'
+				`Cannot add column "${columnid}" because it already exists in table "${tableid}"`
 			);
 		}
 
@@ -13787,11 +13765,7 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 
 		if (!table.xcolumns[columnid]) {
 			throw new Error(
-				'Cannot modify column "' +
-					columnid +
-					'", because it was not found in the table "' +
-					tableid +
-					'"'
+				`Cannot modify column "${columnid}" because it was not found in table "${tableid}"`
 			);
 		}
 
@@ -13857,11 +13831,7 @@ yy.AlterTable.prototype.execute = function (databaseid, params, cb) {
 
 		if (!found) {
 			throw new Error(
-				'Cannot drop column "' +
-					columnid +
-					'", because it was not found in the table "' +
-					tableid +
-					'"'
+				`Cannot drop column "${columnid}" because it was not found in the table ${tableid}"`
 			);
 		}
 
@@ -16520,7 +16490,7 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 					} else {
 						s += 'ss:';
 					}
-					s += attr + '="' + st[key][attr] + '"';
+					s += attr + '=' + JSON.stringify(st[key][attr]);
 				}
 				s += '/>';
 			}
@@ -16530,8 +16500,8 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 			if (styles[hh]) {
 			} else {
 				styles[hh] = {styleid: stylesn};
-				s2 += '<Style ss:ID="s' + stylesn + '">';
-				s2 += s;
+				s2 += `<Style ss:ID=${JSON.stringify('s' + stylesn)}>`;
+				s2 += s.replace(/<\s*\/\s*Style /gi, '<');
 				s2 += '</Style>';
 				stylesn++;
 			}
@@ -16597,9 +16567,9 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 
 			// Header
 			s3 +=
-				'<Worksheet ss:Name="' +
-				sheetid +
-				'"> \
+				'<Worksheet ss:Name=' +
+				JSON.stringify(sheetid) +
+				'> \
 	  			<Table ss:ExpandedColumnCount="' +
 				columns.length +
 				'" ss:ExpandedRowCount="' +
@@ -16608,12 +16578,12 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 	   			x:FullRows="1" ss:DefaultColumnWidth="65" ss:DefaultRowHeight="15">';
 
 			columns.forEach(function (column, columnidx) {
-				s3 +=
-					'<Column ss:Index="' +
-					(columnidx + 1) +
-					'" ss:AutoFitWidth="0" ss:Width="' +
-					column.width +
-					'"/>';
+				s3 += `
+					<Column 
+						ss:Index="${columnidx + 1}" 
+						ss:AutoFitWidth="0" 
+						ss:Width=${JSON.stringify('' + column.width)}
+					/>`;
 			});
 
 			// Headers
@@ -16633,7 +16603,7 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 						} else {
 							extend(st, column.style);
 						}
-						s3 += 'ss:StyleID="' + hstyle(st) + '"';
+						s3 += 'ss:StyleID=' + JSON.stringify(hstyle(st));
 					}
 
 					s3 += '><Data ss:Type="String">';
@@ -16677,7 +16647,7 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 							} else {
 								extend(st, srow.style);
 							}
-							s3 += 'ss:StyleID="' + hstyle(st) + '"';
+							s3 += 'ss:StyleID=' + JSON.stringify(hstyle(st));
 						}
 					}
 
@@ -16743,7 +16713,6 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 						typestyle = typestyle || 'mso-number-format:"\\@";'; // Default type style
 
 						s3 += '<Cell ';
-
 						// Row style fromdefault sheet
 						var st = {};
 						if (typeof cell.style != 'undefined') {
@@ -16752,12 +16721,12 @@ alasql.into.XLSXML = function (filename, opts, data, columns, cb) {
 							} else {
 								extend(st, cell.style);
 							}
-							s3 += 'ss:StyleID="' + hstyle(st) + '"';
+							s3 += 'ss:StyleID=' + JSON.stringify(hstyle(st));
 						}
 
 						s3 += '>';
 
-						s3 += '<Data ss:Type="' + Type + '">';
+						s3 += '<Data ss:Type=' + JSON.stringify(Type) + '>';
 
 						// TODO Replace with extend...
 						var format = cell.format;
@@ -16981,10 +16950,6 @@ alasql.into.XLSX = function (filename, opts, data, columns, cb) {
 					return buf;
 				};
 
-				/* the saveAs call downloads a file on the local machine */
-				//				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+'"');
 				saveAs(new Blob([s2ab(wbout)], {type: 'application/octet-stream'}), filename);
 			}
 		}
@@ -17173,7 +17138,7 @@ alasql.from.CSV = function (contents, opts, cb, idx, query) {
 		separator: ',',
 		quote: '"',
 		headers: true,
-		raw: false
+		raw: false,
 	};
 	alasql.utils.extend(opt, opts);
 	var res;
@@ -17256,7 +17221,12 @@ alasql.from.CSV = function (contents, opts, cb, idx, query) {
 						hs.forEach(function (h, idx) {
 							r[h] = a[idx];
 							// Please avoid === here
-							if (!opt.raw && typeof r[h] !== 'undefined' && r[h].length !== 0 && r[h].trim() == +r[h]) {
+							if (
+								!opt.raw &&
+								typeof r[h] !== 'undefined' &&
+								r[h].length !== 0 &&
+								r[h].trim() == +r[h]
+							) {
 								// jshint ignore:line
 								r[h] = +r[h];
 							}
@@ -17267,7 +17237,12 @@ alasql.from.CSV = function (contents, opts, cb, idx, query) {
 					var r = {};
 					hs.forEach(function (h, idx) {
 						r[h] = a[idx];
-						if (!opt.raw && typeof r[h] !== 'undefined' && r[h].length !== 0 && r[h].trim() == +r[h]) {
+						if (
+							!opt.raw &&
+							typeof r[h] !== 'undefined' &&
+							r[h].length !== 0 &&
+							r[h].trim() == +r[h]
+						) {
 							// jshint ignore:line
 							r[h] = +r[h];
 						}
@@ -17280,7 +17255,12 @@ alasql.from.CSV = function (contents, opts, cb, idx, query) {
 				// different bug here, if headers are not defined, the numerical values will not be parsed
 				a.forEach(function (v, idx) {
 					r[idx] = a[idx];
-					if (!opt.raw && typeof r[idx] !== 'undefined' && r[idx].length !== 0 && r[idx].trim() == +r[idx]) {
+					if (
+						!opt.raw &&
+						typeof r[idx] !== 'undefined' &&
+						r[idx].length !== 0 &&
+						r[idx].trim() == +r[idx]
+					) {
 						// jshint ignore:line
 						r[idx] = +r[idx];
 					}
@@ -18143,7 +18123,9 @@ IDB.fromTable = function (databaseid, tableid, cb, idx, query) {
 		cur.onsuccess = () => {
 			const cursor = cur.result;
 			if (cursor) {
-				res.push(cursor.value);
+				// 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 };
+				res.push(cursorValue);
 				cursor.continue();
 			} else {
 				ixdb.close();