alasql 2.1.5 → 2.1.7

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.1.4-develop-5f5b471d | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v2.1.6-develop-8399ae92 | © 2014-2022 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 2.1.4-develop-5f5b471d
+@version 2.1.6-develop-8399ae92
 
 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.4-develop-5f5b471d';
+alasql.version = '2.1.6-develop-8399ae92';
 
 /**
 	Debug flag
@@ -3484,13 +3484,19 @@ var loadFile = (utils.loadFile = function (path, asy, success, error) {
 			});
 		} else {
 			if (/^[a-z]+:\/\//i.test(path)) {
-				var request = require('request');
-				request(path, function (err, response, body) {
-					if (err) {
-						return error(err, null);
-					}
-					success(cutbom(body.toString()));
-				});
+				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;
+					});
 			} else {
 				//If async callthen call async
 				if (asy) {
@@ -3620,17 +3626,19 @@ var loadBinaryFile = (utils.loadBinaryFile = function (
 		fs = require('fs');
 
 		if (/^[a-z]+:\/\//i.test(path)) {
-			var request = require('request');
-			request({url: path, encoding: null}, function (err, response, data) {
-				if (err) {
-					return error(err);
-				}
-				var arr = [];
-				for (var i = 0; i < data.length; ++i) {
-					arr[i] = String.fromCharCode(data[i]);
-				}
-				success(arr.join(''));
-			});
+			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;
+				});
 		} else {
 			if (runAsync) {
 				fs.readFile(path, function (err, data) {
@@ -4848,422 +4856,7 @@ alasql.compile = function (sql, databaseid) {
 //
 
 if (!utils.global.Promise) {
-	if (utils.isNode) {
-		//*not-for-browser/*
-		utils.global.Promise = require('es6-promise').Promise;
-		//*/
-	} else {
-		/*!
-		 * @overview es6-promise - a tiny implementation of Promises/A+.
-		 * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
-		 * @license   Licensed under MIT license
-		 *            See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE
-		 * @version   3.2.1
-		 */
-		(function () {
-			'use strict';
-			function t(t) {
-				return 'function' == typeof t || ('object' == typeof t && null !== t);
-			}
-			function e(t) {
-				return 'function' == typeof t;
-			}
-			function n(t) {
-				G = t;
-			}
-			function r(t) {
-				Q = t;
-			}
-			function o() {
-				return function () {
-					process.nextTick(a);
-				};
-			}
-			function i() {
-				return function () {
-					B(a);
-				};
-			}
-			function s() {
-				var t = 0,
-					e = new X(a),
-					n = document.createTextNode('');
-				return (
-					e.observe(n, {characterData: !0}),
-					function () {
-						n.data = t = ++t % 2;
-					}
-				);
-			}
-			function u() {
-				var t = new MessageChannel();
-				return (
-					(t.port1.onmessage = a),
-					function () {
-						t.port2.postMessage(0);
-					}
-				);
-			}
-			function c() {
-				return function () {
-					setTimeout(a, 1);
-				};
-			}
-			function a() {
-				for (var t = 0; J > t; t += 2) {
-					var e = tt[t],
-						n = tt[t + 1];
-					e(n), (tt[t] = void 0), (tt[t + 1] = void 0);
-				}
-				J = 0;
-			}
-			function f() {
-				try {
-					var t = require,
-						e = t('vertx');
-					return (B = e.runOnLoop || e.runOnContext), i();
-				} catch (n) {
-					return c();
-				}
-			}
-			function l(t, e) {
-				var n = this,
-					r = new this.constructor(p);
-				void 0 === r[rt] && k(r);
-				var o = n._state;
-				if (o) {
-					var i = arguments[o - 1];
-					Q(function () {
-						x(o, r, i, n._result);
-					});
-				} else E(n, r, t, e);
-				return r;
-			}
-			function h(t) {
-				var e = this;
-				if (t && 'object' == typeof t && t.constructor === e) return t;
-				var n = new e(p);
-				return g(n, t), n;
-			}
-			function p() {}
-			function _() {
-				return new TypeError('You cannot resolve a promise with itself');
-			}
-			function d() {
-				return new TypeError('A promises callback cannot return that same promise.');
-			}
-			function v(t) {
-				try {
-					return t.then;
-				} catch (e) {
-					return (ut.error = e), ut;
-				}
-			}
-			function y(t, e, n, r) {
-				try {
-					t.call(e, n, r);
-				} catch (o) {
-					return o;
-				}
-			}
-			function m(t, e, n) {
-				Q(function (t) {
-					var r = !1,
-						o = y(
-							n,
-							e,
-							function (n) {
-								r || ((r = !0), e !== n ? g(t, n) : S(t, n));
-							},
-							function (e) {
-								r || ((r = !0), j(t, e));
-							},
-							'Settle: ' + (t._label || ' unknown promise')
-						);
-					!r && o && ((r = !0), j(t, o));
-				}, t);
-			}
-			function b(t, e) {
-				e._state === it
-					? S(t, e._result)
-					: e._state === st
-					? j(t, e._result)
-					: E(
-							e,
-							void 0,
-							function (e) {
-								g(t, e);
-							},
-							function (e) {
-								j(t, e);
-							}
-					  );
-			}
-			function w(t, n, r) {
-				n.constructor === t.constructor && r === et && constructor.resolve === nt
-					? b(t, n)
-					: r === ut
-					? j(t, ut.error)
-					: void 0 === r
-					? S(t, n)
-					: e(r)
-					? m(t, n, r)
-					: S(t, n);
-			}
-			function g(e, n) {
-				e === n ? j(e, _()) : t(n) ? w(e, n, v(n)) : S(e, n);
-			}
-			function A(t) {
-				t._onerror && t._onerror(t._result), T(t);
-			}
-			function S(t, e) {
-				t._state === ot &&
-					((t._result = e), (t._state = it), 0 !== t._subscribers.length && Q(T, t));
-			}
-			function j(t, e) {
-				t._state === ot && ((t._state = st), (t._result = e), Q(A, t));
-			}
-			function E(t, e, n, r) {
-				var o = t._subscribers,
-					i = o.length;
-				(t._onerror = null),
-					(o[i] = e),
-					(o[i + it] = n),
-					(o[i + st] = r),
-					0 === i && t._state && Q(T, t);
-			}
-			function T(t) {
-				var e = t._subscribers,
-					n = t._state;
-				if (0 !== e.length) {
-					for (var r, o, i = t._result, s = 0; s < e.length; s += 3)
-						(r = e[s]), (o = e[s + n]), r ? x(n, r, o, i) : o(i);
-					t._subscribers.length = 0;
-				}
-			}
-			function M() {
-				this.error = null;
-			}
-			function P(t, e) {
-				try {
-					return t(e);
-				} catch (n) {
-					return (ct.error = n), ct;
-				}
-			}
-			function x(t, n, r, o) {
-				var i,
-					s,
-					u,
-					c,
-					a = e(r);
-				if (a) {
-					if (((i = P(r, o)), i === ct ? ((c = !0), (s = i.error), (i = null)) : (u = !0), n === i))
-						return void j(n, d());
-				} else (i = o), (u = !0);
-				n._state !== ot ||
-					(a && u ? g(n, i) : c ? j(n, s) : t === it ? S(n, i) : t === st && j(n, i));
-			}
-			function C(t, e) {
-				try {
-					e(
-						function (e) {
-							g(t, e);
-						},
-						function (e) {
-							j(t, e);
-						}
-					);
-				} catch (n) {
-					j(t, n);
-				}
-			}
-			function O() {
-				return at++;
-			}
-			function k(t) {
-				(t[rt] = at++), (t._state = void 0), (t._result = void 0), (t._subscribers = []);
-			}
-			function Y(t) {
-				return new _t(this, t).promise;
-			}
-			function q(t) {
-				var e = this;
-				return new e(
-					I(t)
-						? function (n, r) {
-								for (var o = t.length, i = 0; o > i; i++) e.resolve(t[i]).then(n, r);
-						  }
-						: function (t, e) {
-								e(new TypeError('You must pass an array to race.'));
-						  }
-				);
-			}
-			function F(t) {
-				var e = this,
-					n = new e(p);
-				return j(n, t), n;
-			}
-			function D() {
-				throw new TypeError(
-					'You must pass a resolver function as the first argument to the promise constructor'
-				);
-			}
-			function K() {
-				throw new TypeError(
-					"Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function."
-				);
-			}
-			function L(t) {
-				(this[rt] = O()),
-					(this._result = this._state = void 0),
-					(this._subscribers = []),
-					p !== t && ('function' != typeof t && D(), this instanceof L ? C(this, t) : K());
-			}
-			function N(t, e) {
-				(this._instanceConstructor = t),
-					(this.promise = new t(p)),
-					this.promise[rt] || k(this.promise),
-					Array.isArray(e)
-						? ((this._input = e),
-						  (this.length = e.length),
-						  (this._remaining = e.length),
-						  (this._result = new Array(this.length)),
-						  0 === this.length
-								? S(this.promise, this._result)
-								: ((this.length = this.length || 0),
-								  this._enumerate(),
-								  0 === this._remaining && S(this.promise, this._result)))
-						: j(this.promise, U());
-			}
-			function U() {
-				return new Error('Array Methods must be provided an Array');
-			}
-			function W() {
-				var t;
-				if ('undefined' != typeof global) t = global;
-				else if ('undefined' != typeof self) t = self;
-				else
-					try {
-						t = Function('return this')();
-					} catch (e) {
-						throw new Error(
-							'polyfill failed because global object is unavailable in this environment'
-						);
-					}
-				var n = t.Promise;
-				(!n || '[object Promise]' !== Object.prototype.toString.call(n.resolve()) || n.cast) &&
-					(t.Promise = pt);
-			}
-			var z;
-			z = Array.isArray
-				? Array.isArray
-				: function (t) {
-						return '[object Array]' === Object.prototype.toString.call(t);
-				  };
-			var B,
-				G,
-				H,
-				I = z,
-				J = 0,
-				Q = function (t, e) {
-					(tt[J] = t), (tt[J + 1] = e), (J += 2), 2 === J && (G ? G(a) : H());
-				},
-				R = 'undefined' != typeof window ? window : void 0,
-				V = R || {},
-				X = V.MutationObserver || V.WebKitMutationObserver,
-				Z =
-					'undefined' == typeof self &&
-					'undefined' != typeof process &&
-					'[object process]' === {}.toString.call(process),
-				$ =
-					'undefined' != typeof Uint8ClampedArray &&
-					'undefined' != typeof importScripts &&
-					'undefined' != typeof MessageChannel,
-				tt = new Array(1e3);
-			H = Z ? o() : X ? s() : $ ? u() : void 0 === R && 'function' == typeof require ? f() : c();
-			var et = l,
-				nt = h,
-				rt = Math.random().toString(36).substring(16),
-				ot = void 0,
-				it = 1,
-				st = 2,
-				ut = new M(),
-				ct = new M(),
-				at = 0,
-				ft = Y,
-				lt = q,
-				ht = F,
-				pt = L;
-			(L.all = ft),
-				(L.race = lt),
-				(L.resolve = nt),
-				(L.reject = ht),
-				(L._setScheduler = n),
-				(L._setAsap = r),
-				(L._asap = Q),
-				(L.prototype = {
-					constructor: L,
-					then: et,
-					catch: function (t) {
-						return this.then(null, t);
-					},
-				});
-			var _t = N;
-			(N.prototype._enumerate = function () {
-				for (var t = this.length, e = this._input, n = 0; this._state === ot && t > n; n++)
-					this._eachEntry(e[n], n);
-			}),
-				(N.prototype._eachEntry = function (t, e) {
-					var n = this._instanceConstructor,
-						r = n.resolve;
-					if (r === nt) {
-						var o = v(t);
-						if (o === et && t._state !== ot) this._settledAt(t._state, e, t._result);
-						else if ('function' != typeof o) this._remaining--, (this._result[e] = t);
-						else if (n === pt) {
-							var i = new n(p);
-							w(i, t, o), this._willSettleAt(i, e);
-						} else
-							this._willSettleAt(
-								new n(function (e) {
-									e(t);
-								}),
-								e
-							);
-					} else this._willSettleAt(r(t), e);
-				}),
-				(N.prototype._settledAt = function (t, e, n) {
-					var r = this.promise;
-					r._state === ot && (this._remaining--, t === st ? j(r, n) : (this._result[e] = n)),
-						0 === this._remaining && S(r, this._result);
-				}),
-				(N.prototype._willSettleAt = function (t, e) {
-					var n = this;
-					E(
-						t,
-						void 0,
-						function (t) {
-							n._settledAt(it, e, t);
-						},
-						function (t) {
-							n._settledAt(st, e, t);
-						}
-					);
-				});
-			var dt = W,
-				vt = {Promise: pt, polyfill: dt};
-			'function' == typeof define && define.amd
-				? define(function () {
-						return vt;
-				  })
-				: 'undefined' != typeof module && module.exports
-				? (module.exports = vt)
-				: 'undefined' != typeof this && (this.ES6Promise = vt),
-				dt();
-		}.call(this));
-
-	}
+	utils.global.Promise = Promise;
 }
 
 var promiseExec = function (sql, params, counterStep, counterTotal) {
@@ -10508,8 +10101,8 @@ yy.Over.prototype.toString = function () {
 */
 
 /**
-  	Expression statement ( = 2*2; )
-  	@class
+		Expression statement ( = 2*2; )
+		@class
 	@param {object} params Initial parameters
 */
 yy.ExpressionStatement = function (params) {
@@ -10633,8 +10226,7 @@ yy.JavaScript.prototype.toString = function () {
 	return s;
 };
 
-yy.JavaScript.prototype.toJS = function (/* context, tableid, defcols*/) {
-
+yy.JavaScript.prototype.toJS = function () {
 	return '(' + this.value + ')';
 };
 yy.JavaScript.prototype.execute = function (databaseid, params, cb) {
@@ -10683,8 +10275,6 @@ yy.Join.prototype.toString = function () {
 	return s;
 };
 
-// }
-
 /**
 	Table class
 	@class
@@ -10762,6 +10352,7 @@ yy.Op.prototype.toString = function () {
 
 		return s;
 	}
+
 	return (
 		this.left.toString() +
 		' ' +
@@ -10773,7 +10364,6 @@ yy.Op.prototype.toString = function () {
 };
 
 yy.Op.prototype.findAggregator = function (query) {
-
 	if (this.left && this.left.findAggregator) {
 		this.left.findAggregator(query);
 	}
@@ -10905,17 +10495,28 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	}
 
 	if (this.op === 'IS') {
-		s =
-			'' +
-			'(' +
-			'(' +
-			leftJS() +
-			'==null)' + // Cant be ===
-			' === ' +
-			'(' +
-			rightJS() +
-			'==null)' + // Cant be ===
-			')';
+		const leftOperand = leftJS();
+		const rightOperand = rightJS();
+		if (
+			this.right instanceof yy.NullValue ||
+			(this.right.op === 'NOT' && this.right.right instanceof yy.NullValue)
+		) {
+			s = `(
+					(${leftOperand}==null)   // Cant be ===
+					===
+					(${rightOperand}==null)  // Cant be ===
+				)`;
+		} else {
+			s = `(
+					(${leftOperand} == ${rightOperand})
+					||
+					(
+						${leftOperand}  < 0
+						&& 
+						true == ${rightOperand} 
+					) 
+				)`;
+		}
 	}
 
 	if (this.op === '==') {
@@ -10978,7 +10579,6 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 			')' +
 			')' +
 			')';
-
 	}
 
 	if (this.op === 'IN') {
@@ -11014,13 +10614,10 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	if (this.op === 'NOT IN') {
 		if (this.right instanceof yy.Select) {
 			s = '(';
-			//this.query.queriesdata['+this.queriesidx+']
-			//			s += 'alasql.utils.flatArray(this.query.queriesfn['+(this.queriesidx)+'](params,null,p))';
 			s += 'alasql.utils.flatArray(this.queriesfn[' + this.queriesidx + '](params,null,p))';
 			s += '.indexOf(';
 			s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 		} else if (Array.isArray(this.right)) {
-			//			if(this.right.length == 0) return 'true';
 			s = '([' + this.right.map(ref).join(',') + '].indexOf(';
 			s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 		} else {
@@ -11034,7 +10631,6 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	if (this.allsome === 'ALL') {
 		var s;
 		if (this.right instanceof yy.Select) {
-			//			var s = 'this.query.queriesdata['+this.queriesidx+']';
 			s = 'alasql.utils.flatArray(this.query.queriesfn[' + this.queriesidx + '](params,null,p))';
 
 			s += '.every(function(b){return (';
@@ -11053,7 +10649,6 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	if (this.allsome === 'SOME' || this.allsome === 'ANY') {
 		var s;
 		if (this.right instanceof yy.Select) {
-			//			var s = 'this.query.queriesdata['+this.queriesidx+']';
 			s = 'alasql.utils.flatArray(this.query.queriesfn[' + this.queriesidx + '](params,null,p))';
 			s += '.some(function(b){return (';
 			s += leftJS() + ')' + op + 'b})';
@@ -11092,12 +10687,9 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 	// 	// 		+ ')';
 	// }
 
-	// Change names
-
 	var expr = s || '(' + leftJS() + op + rightJS() + ')';
 
 	var declareRefs = 'y=[(' + refs.join('), (') + ')]';
-
 	if (op === '&&' || op === '||' || op === 'IS' || op === 'IS NULL' || op === 'IS NOT NULL') {
 		return '(' + declareRefs + ', ' + expr + ')';
 	}
@@ -11149,8 +10741,6 @@ yy.StringValue.prototype.toType = function () {
 };
 
 yy.StringValue.prototype.toJS = function () {
-
-	//	return "'"+doubleqq(this.value)+"'";
 	return "'" + escapeq(this.value) + "'";
 };
 
@@ -11183,8 +10773,6 @@ yy.ArrayValue.prototype.toType = function () {
 };
 
 yy.ArrayValue.prototype.toJS = function (context, tableid, defcols) {
-
-	//	return "'"+doubleqq(this.value)+"'";
 	return (
 		'[(' +
 		this.value
@@ -11332,7 +10920,6 @@ yy.Column = function (params) {
 yy.Column.prototype.toString = function () {
 	var s;
 	if (this.columnid == +this.columnid) {
-		// jshint ignore:line
 		s = '[' + this.columnid + ']';
 	} else {
 		s = this.columnid;
@@ -11351,7 +10938,6 @@ yy.Column.prototype.toString = function () {
 };
 
 yy.Column.prototype.toJS = function (context, tableid, defcols) {
-
 	var s = '';
 	if (!this.tableid && tableid === '' && !defcols) {
 		if (this.columnid !== '_') {
@@ -11365,17 +10951,10 @@ yy.Column.prototype.toJS = function (context, tableid, defcols) {
 		}
 	} else {
 		if (context === 'g') {
-			// if(this.columnid == '_') {
-			// } else {
 			s = "g['" + this.nick + "']";
-			// }
 		} else if (this.tableid) {
 			if (this.columnid !== '_') {
-				// if() {
-				// s = context+'[\''+tableid + '\'][\''+this.tableid+'\'][\''+this.columnid+'\']';
-				// } else {
 				s = context + "['" + this.tableid + "']['" + this.columnid + "']";
-				// }
 			} else {
 				if (context === 'g') {
 					s = "g['_']";
@@ -11398,22 +10977,13 @@ yy.Column.prototype.toJS = function (context, tableid, defcols) {
 
 			} else {
 				if (this.columnid !== '_') {
-					// if(defcols['.'][this.tableid]) {
-
-					// 	s = context+'[\''+tableid + '\'][\''+this.tableid + '\'][\''+this.columnid+'\']';
-					// } else {
 					s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
-					// }
 				} else {
 					s = context + "['" + (this.tableid || tableid) + "']";
 				}
 			}
 		} else if (tableid === -1) {
-			//			if(this.columnid != '') {
 			s = context + "['" + this.columnid + "']";
-			//			} else {
-			//				s = context;
-			//			}
 		} else {
 			if (this.columnid !== '_') {
 				s = context + "['" + (this.tableid || tableid) + "']['" + this.columnid + "']";
@@ -11422,9 +10992,6 @@ yy.Column.prototype.toJS = function (context, tableid, defcols) {
 			}
 		}
 	}
-
-	//	console.trace(new Error());
-
 	return s;
 };
 
@@ -11456,16 +11023,8 @@ yy.AggrValue.prototype.toString = function () {
 };
 
 yy.AggrValue.prototype.findAggregator = function (query) {
-
-	//	var colas = this.as || this.toString();
-
 	var colas = escapeq(this.toString()) + ':' + query.selectGroup.length;
-
-	//		if(!query.selectColumns[colas]) {
-	//		}
-
 	var found = false;
-
 	if (!found) {
 		if (!this.nick) {
 			this.nick = colas;
@@ -11482,8 +11041,6 @@ yy.AggrValue.prototype.findAggregator = function (query) {
 		}
 		query.selectGroup.push(this);
 	}
-
-	//		this.reduced = true;
 	return;
 };
 
@@ -11505,8 +11062,7 @@ yy.AggrValue.prototype.toType = function () {
 	return this.expression.toType();
 };
 
-yy.AggrValue.prototype.toJS = function (/*context, tableid, defcols*/) {
-
+yy.AggrValue.prototype.toJS = function () {
 	var colas = this.nick;
 	if (colas === undefined) {
 		colas = this.toString();
@@ -11517,6 +11073,7 @@ yy.AggrValue.prototype.toJS = function (/*context, tableid, defcols*/) {
 yy.OrderExpression = function (params) {
 	return yy.extend(this, params);
 };
+
 yy.OrderExpression.prototype.toString = yy.Expression.prototype.toString;
 
 yy.GroupExpression = function (params) {
@@ -15750,10 +15307,6 @@ yy.SetVariable.prototype.execute = function (databaseid, params, cb) {
 	return res;
 };
 
-// Console functions
-
-/* global alasql, yy */
-
 alasql.test = function (name, times, fn) {
 	if (arguments.length === 0) {
 		alasql.log(alasql.con.results);
@@ -19779,7 +19332,7 @@ if (typeof module !== 'undefined' && module.exports) {
 
 /*only-for-browser/*
 if(utils.isCordova || utils.isMeteorServer || utils.isNode ){
-  console.warn('It looks like you are using the browser version of AlaSQL. Please use the alasql.fs.js file instead.')
+  console.log('It looks like you are using the browser version of AlaSQL. Please use the alasql.fs.js file instead.')
 }
 //*/