alasql 4.2.1 → 4.2.3

package/Untitled-1.js

@@ -0,0 +1 @@
+≤

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.2.0 build: develop-67d9f6dd | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.2 build: develop-a55b6500 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.2.0
+@version 4.2.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.2.0 build: develop-67d9f6dd | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.2 build: develop-a55b6500 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.2.0
+@version 4.2.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '4.2.0';
-alasql.build = 'develop-67d9f6dd';
+alasql.version = '4.2.2';
+alasql.build = 'develop-a55b6500';
 
 /**
 	Debug flag
@@ -4393,7 +4393,7 @@ alasql.utils.uncomment = function (str) {
 			}
 		} else if (lineComment) {
 			// One-line comments end with the line-break
-			if (str[i + 1] === '\n' || str[i + 1] === '\r') {
+			if (str[i + 1] === '\n' || str[i + 1] === '\r' || str.length - 2 === i) {
 				lineComment = false;
 			}
 			str[i] = '';
@@ -4404,9 +4404,9 @@ alasql.utils.uncomment = function (str) {
 			} else if (str[i] === '[' && str[i - 1] !== '@') {
 				quote = true;
 				quoteSign = ']';
-				// } else if (str[i] === '-' &&  str[i + 1] === '-') {
-				// 	str[i] = '';
-				// 	lineComment = true;
+			} else if (str[i] === '-' && str[i + 1] === '-') {
+				str[i] = '';
+				lineComment = true;
 			} else if (str[i] === '/' && str[i + 1] === '*') {
 				// Do not filter out conditional comments /*@ ... */
 				// and comments marked as protected /*! ... */
@@ -6629,8 +6629,10 @@ function queryfn3(query) {
 				var d = query.selectgfn(g, query.params, alasql);
 
 				for (const key in query.groupColumns) {
-					if (query.groupColumns[key] !== key && d[query.groupColumns[key]])
+					// ony remove columns where the alias is also not a column in the result
+					if (query.groupColumns[key] !== key && d[query.groupColumns[key]] && !query.groupColumns[query.groupColumns[key]]){
 						delete d[query.groupColumns[key]];
+					}
 				}
 				query.data.push(d);
 			}
@@ -10705,13 +10707,28 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
 				} else if (Array.isArray(this.right)) {
-					// leverage JS Set, which is faster for lookups than arrays
-					s =
-						'(new Set([' +
-						this.right.map(ref).join(',') +
-						']).has(alasql.utils.getValueOf(' +
-						leftJS() +
-						')))';
+					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+						// When not using cache, or when the array contains parameters, we need to re-create the Set
+						// leverage JS Set, which is faster for lookups than arrays
+						s =
+							'(new Set([' +
+							this.right.map(ref).join(',') +
+							']).has(alasql.utils.getValueOf(' +
+							leftJS() +
+							')))';
+					} else {
+						// Use a cache to not re-create the Set on every identitical query 
+						if (!alasql.sets) {
+							alasql.sets = {};
+						}
+						const allValues = this.right.map((value) => value.value);
+						const allValuesStr = allValues.join(",");
+						if (!alasql.sets[allValuesStr]) {
+							// leverage JS Set, which is faster for lookups than arrays
+							alasql.sets[allValuesStr] = new Set(allValues);
+						}
+						s = 'alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
+					}
 				} else {
 					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
 
@@ -10727,13 +10744,28 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 				} else if (Array.isArray(this.right)) {
-					// leverage JS Set, which is faster for lookups than arrays
-					s =
-						'(!(new Set([' +
-						this.right.map(ref).join(',') +
-						']).has(alasql.utils.getValueOf(' +
-						leftJS() +
-						'))))';
+					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+						// When not using cache, or when the array contains parameters, we need to re-create the Set
+						// leverage JS Set, which is faster for lookups than arrays
+						s =
+							'(!(new Set([' +
+							this.right.map(ref).join(',') +
+							']).has(alasql.utils.getValueOf(' +
+							leftJS() +
+							'))))';
+					} else {
+						// Use a cache to not re-create the Set on every identitical query 
+						if (!alasql.sets) {
+							alasql.sets = {};
+						}
+						const allValues = this.right.map((value) => value.value);
+						const allValuesStr = allValues.join(",");
+						if (!alasql.sets[allValuesStr]) {
+							// leverage JS Set, which is faster for lookups than arrays
+							alasql.sets[allValuesStr] = new Set(allValues);
+						}
+						s = '!alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
+					}
 				} else {
 					s = '(' + rightJS() + '.indexOf(';
 					s += leftJS() + ')==-1)';
@@ -10976,7 +11008,7 @@ yy.Over = class Over {
 
 		toString() {
 			var s;
-			const {op, right} = this;
+			const { op, right } = this;
 			const res = right.toString();
 
 			if (op === '~') {

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.2.0 build: develop-67d9f6dd | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.2.2 build: develop-a55b6500 | © 2014-2023 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.2.0
+@version 4.2.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2023	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '4.2.0';
-alasql.build = 'develop-67d9f6dd';
+alasql.version = '4.2.2';
+alasql.build = 'develop-a55b6500';
 
 /**
 	Debug flag
@@ -4393,7 +4393,7 @@ alasql.utils.uncomment = function (str) {
 			}
 		} else if (lineComment) {
 			// One-line comments end with the line-break
-			if (str[i + 1] === '\n' || str[i + 1] === '\r') {
+			if (str[i + 1] === '\n' || str[i + 1] === '\r' || str.length - 2 === i) {
 				lineComment = false;
 			}
 			str[i] = '';
@@ -4404,9 +4404,9 @@ alasql.utils.uncomment = function (str) {
 			} else if (str[i] === '[' && str[i - 1] !== '@') {
 				quote = true;
 				quoteSign = ']';
-				// } else if (str[i] === '-' &&  str[i + 1] === '-') {
-				// 	str[i] = '';
-				// 	lineComment = true;
+			} else if (str[i] === '-' && str[i + 1] === '-') {
+				str[i] = '';
+				lineComment = true;
 			} else if (str[i] === '/' && str[i + 1] === '*') {
 				// Do not filter out conditional comments /*@ ... */
 				// and comments marked as protected /*! ... */
@@ -6629,8 +6629,10 @@ function queryfn3(query) {
 				var d = query.selectgfn(g, query.params, alasql);
 
 				for (const key in query.groupColumns) {
-					if (query.groupColumns[key] !== key && d[query.groupColumns[key]])
+					// ony remove columns where the alias is also not a column in the result
+					if (query.groupColumns[key] !== key && d[query.groupColumns[key]] && !query.groupColumns[query.groupColumns[key]]){
 						delete d[query.groupColumns[key]];
+					}
 				}
 				query.data.push(d);
 			}
@@ -10705,13 +10707,28 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
 				} else if (Array.isArray(this.right)) {
-					// leverage JS Set, which is faster for lookups than arrays
-					s =
-						'(new Set([' +
-						this.right.map(ref).join(',') +
-						']).has(alasql.utils.getValueOf(' +
-						leftJS() +
-						')))';
+					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+						// When not using cache, or when the array contains parameters, we need to re-create the Set
+						// leverage JS Set, which is faster for lookups than arrays
+						s =
+							'(new Set([' +
+							this.right.map(ref).join(',') +
+							']).has(alasql.utils.getValueOf(' +
+							leftJS() +
+							')))';
+					} else {
+						// Use a cache to not re-create the Set on every identitical query 
+						if (!alasql.sets) {
+							alasql.sets = {};
+						}
+						const allValues = this.right.map((value) => value.value);
+						const allValuesStr = allValues.join(",");
+						if (!alasql.sets[allValuesStr]) {
+							// leverage JS Set, which is faster for lookups than arrays
+							alasql.sets[allValuesStr] = new Set(allValues);
+						}
+						s = 'alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
+					}
 				} else {
 					s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
 
@@ -10727,13 +10744,28 @@ yy.Over = class Over {
 					s += '.indexOf(';
 					s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 				} else if (Array.isArray(this.right)) {
-					// leverage JS Set, which is faster for lookups than arrays
-					s =
-						'(!(new Set([' +
-						this.right.map(ref).join(',') +
-						']).has(alasql.utils.getValueOf(' +
-						leftJS() +
-						'))))';
+					if (!alasql.options.cache || this.right.filter((value) => value instanceof yy.ParamValue).length > 0) {
+						// When not using cache, or when the array contains parameters, we need to re-create the Set
+						// leverage JS Set, which is faster for lookups than arrays
+						s =
+							'(!(new Set([' +
+							this.right.map(ref).join(',') +
+							']).has(alasql.utils.getValueOf(' +
+							leftJS() +
+							'))))';
+					} else {
+						// Use a cache to not re-create the Set on every identitical query 
+						if (!alasql.sets) {
+							alasql.sets = {};
+						}
+						const allValues = this.right.map((value) => value.value);
+						const allValuesStr = allValues.join(",");
+						if (!alasql.sets[allValuesStr]) {
+							// leverage JS Set, which is faster for lookups than arrays
+							alasql.sets[allValuesStr] = new Set(allValues);
+						}
+						s = '!alasql.sets["' + allValuesStr + '"].has(alasql.utils.getValueOf(' + leftJS() + '))';
+					}
 				} else {
 					s = '(' + rightJS() + '.indexOf(';
 					s += leftJS() + ')==-1)';
@@ -10976,7 +11008,7 @@ yy.Over = class Over {
 
 		toString() {
 			var s;
-			const {op, right} = this;
+			const { op, right } = this;
 			const res = right.toString();
 
 			if (op === '~') {