.github/workflows/codeql.yml

@@ -50,7 +50,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -77,6 +77,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -59,14 +59,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
+        uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
         with:
           sarif_file: results.sarif

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alasql",
 	"description": "Use SQL to select and filter javascript data - including relational joins and search in nested objects (JSON). Export to and import from Excel and CSV",
-	"version": "4.2.5",
+	"version": "4.2.6",
 	"author": "Andrey Gershun <agershun@gmail.com>",
 	"contributors": [
 		"Mathias Wulff <m@rawu.dk>"
@@ -53,8 +53,8 @@
 		"blueimp-md5": "2.19.0",
 		"cmdmix": "2.1.1",
 		"dom-storage": "2.1.0",
-		"esbuild": "^0.19.3",
-		"eslint": "8.53.0",
+		"esbuild": "0.19.12",
+		"eslint": "8.56.0",
 		"eslint-config-standard": "17.1.0",
 		"eslint-plugin-import": "2.29.1",
 		"eslint-plugin-n": "16.3.1",
@@ -63,11 +63,11 @@
 		"git-branch-is": "4.0.0",
 		"husky": "8.0.3",
 		"jison-gho": "^0.6.1-216",
-		"lint-staged": "15.1.0",
+		"lint-staged": "15.2.0",
 		"mocha": "10.2.0",
 		"mocha.parallel": "0.15.6",
-		"open": "10.0.2",
-		"prettier": "^3.0.3",
+		"open": "10.0.3",
+		"prettier": "3.2.4",
 		"react-native-fetch-blob": "^0.10.8",
 		"react-native-fs": "^2.20.0",
 		"rexreplace": "7.1.3",
@@ -82,7 +82,9 @@
 		"underscore": "1",
 		"glob-parent": "6",
 		"decode-uri-component": "0.2",
-		"semver": "7"
+		"semver": "7",
+		"@gerhobbelt/json5": "2.1.0-48",
+		"minimist": "1.2.6"
 	},
 	"engines": {
 		"node": ">=15"

src/50expression.js

@@ -192,9 +192,29 @@
 	const toTypeNumberOps = new Set(['-', '*', '/', '%', '^']);
 	const toTypeStringOps = new Set(['||']);
 	const toTypeBoolOps = new Set([
-		'AND', 'OR', 'NOT', '=', '==', '===', '!=', '!==', '!===',
-		'>', '>=', '<', '<=', 'IN', 'NOT IN', 'LIKE', 'NOT LIKE',
-		'REGEXP', 'GLOB', 'BETWEEN', 'NOT BETWEEN', 'IS NULL', 'IS NOT NULL'
+		'AND',
+		'OR',
+		'NOT',
+		'=',
+		'==',
+		'===',
+		'!=',
+		'!==',
+		'!===',
+		'>',
+		'>=',
+		'<',
+		'<=',
+		'IN',
+		'NOT IN',
+		'LIKE',
+		'NOT LIKE',
+		'REGEXP',
+		'GLOB',
+		'BETWEEN',
+		'NOT BETWEEN',
+		'IS NULL',
+		'IS NOT NULL',
 	]);
 	class Op {
 		constructor(params) {
@@ -227,7 +247,6 @@
 			return `${leftStr} ${this.op} ${this.allsome ? this.allsome + ' ' : ''}${this.right.toString()}`;
 		}
 
-
 		findAggregator(query) {
 			if (this.left && this.left.findAggregator) {
 				this.left.findAggregator(query);
@@ -239,13 +258,9 @@
 		}
 
 		toType(tableid) {
-			if (toTypeNumberOps.has(this.op))
-				return 'number';
-
-
-			if (toTypeStringOps.has(this.op))
-				return 'string';
+			if (toTypeNumberOps.has(this.op)) return 'number';
 
+			if (toTypeStringOps.has(this.op)) return 'string';
 
 			if (this.op === '+') {
 				const leftType = this.left.toType(tableid);
@@ -259,18 +274,13 @@
 				}
 			}
 
-			if (toTypeBoolOps.has(this.op) || this.allsome)
-				return 'boolean';
-
-
-			if (!this.op)
-				return this.left.toType(tableid);
+			if (toTypeBoolOps.has(this.op) || this.allsome) return 'boolean';
 
+			if (!this.op) return this.left.toType(tableid);
 
 			return 'unknown';
 		}
 
-
 		toJS(context, tableid, defcols) {
 			//	console.log(this);
 			var s;
@@ -556,7 +566,6 @@
 				op = '&&';
 			}
 
-
 			var expr = s || '(' + leftJS() + op + rightJS() + ')';
 
 			var declareRefs = 'y=[(' + refs.join('), (') + ')]';
@@ -724,7 +733,7 @@
 		'~': '~',
 		'-': '-',
 		'+': '+',
-		'NOT': '!',
+		NOT: '!',
 	};
 
 	class UniOp {
@@ -733,7 +742,7 @@
 		}
 
 		toString() {
-			const { op, right } = this;
+			const {op, right} = this;
 			const res = right.toString();
 
 			switch (op) {
@@ -767,8 +776,6 @@
 			}
 		}
 
-
-
 		toJS(context, tableid, defcols) {
 			if (this.right instanceof Column && this.op === '#') {
 				return `(alasql.databases[alasql.useid].objects['${this.right.columnid}'])`;
@@ -786,10 +793,8 @@
 
 			throw new Error(`Unsupported operator: ${this.op}`);
 		}
-
 	}
 
-
 	class Column {
 		constructor(params) {
 			assign(this, params);
@@ -813,38 +818,52 @@
 			return s;
 		}
 
-
 		toJS(context, tableid, defcols) {
 			if (!this.tableid && tableid === '' && !defcols) {
-				return this.columnid !== '_' ? `${context}['${this.columnid}']` : (context === 'g' ? "g['_']" : context);
+				return this.columnid !== '_'
+					? `${context}['${this.columnid}']`
+					: context === 'g'
+						? "g['_']"
+						: context;
 			}
 
 			if (context === 'g') {
 				return `g['${this.nick}']`;
 			}
 
 			if (this.tableid) {
-				return this.columnid !== '_' ? `${context}['${this.tableid}']['${this.columnid}']` : (context === 'g' ? "g['_']" : `${context}['${this.tableid}']`);
+				return this.columnid !== '_'
+					? `${context}['${this.tableid}']['${this.columnid}']`
+					: context === 'g'
+						? "g['_']"
+						: `${context}['${this.tableid}']`;
 			}
 
 			if (defcols) {
 				const tbid = defcols[this.columnid];
 				if (tbid === '-') {
-					throw new Error(`Cannot resolve column "${this.columnid}" because it exists in two source tables`);
+					throw new Error(
+						`Cannot resolve column "${this.columnid}" because it exists in two source tables`
+					);
 				} else if (tbid) {
-					return this.columnid !== '_' ? `${context}['${tbid}']['${this.columnid}']` : `${context}['${tbid}']`;
+					return this.columnid !== '_'
+						? `${context}['${tbid}']['${this.columnid}']`
+						: `${context}['${tbid}']`;
 				} else {
-					return this.columnid !== '_' ? `${context}['${this.tableid || tableid}']['${this.columnid}']` : `${context}['${this.tableid || tableid}']`;
+					return this.columnid !== '_'
+						? `${context}['${this.tableid || tableid}']['${this.columnid}']`
+						: `${context}['${this.tableid || tableid}']`;
 				}
 			}
 
 			if (tableid === -1) {
 				return `${context}['${this.columnid}']`;
 			}
 
-			return this.columnid !== '_' ? `${context}['${this.tableid || tableid}']['${this.columnid}']` : `${context}['${this.tableid || tableid}']`;
+			return this.columnid !== '_'
+				? `${context}['${this.tableid || tableid}']['${this.columnid}']`
+				: `${context}['${this.tableid || tableid}']`;
 		}
-
 	}
 
 	class AggrValue {
@@ -853,15 +872,17 @@
 		}
 
 		toString() {
-			const funcName = this.aggregatorid === 'REDUCE' ? this.funcid.replace(re_invalidFnNameChars, '') : this.aggregatorid;
+			const funcName =
+				this.aggregatorid === 'REDUCE'
+					? this.funcid.replace(re_invalidFnNameChars, '')
+					: this.aggregatorid;
 			const distinctPart = this.distinct ? 'DISTINCT ' : '';
 			const expressionPart = this.expression ? this.expression.toString() : '';
 			const overPart = this.over ? ` ${this.over.toString()}` : '';
 
 			return `${funcName}(${distinctPart}${expressionPart})${overPart}`;
 		}
 
-
 		findAggregator(query) {
 			const colas = escapeq(this.toString()) + ':' + query.selectGroup.length;
 
@@ -876,9 +897,12 @@
 			query.selectGroup.push(this);
 		}
 
-
 		toType() {
-			if (['SUM', 'COUNT', 'AVG', 'MIN', 'MAX', 'AGGR', 'VAR', 'STDDEV', 'TOTAL'].includes(this.aggregatorid)) {
+			if (
+				['SUM', 'COUNT', 'AVG', 'MIN', 'MAX', 'AGGR', 'VAR', 'STDDEV', 'TOTAL'].includes(
+					this.aggregatorid
+				)
+			) {
 				return 'number';
 			}
 

tslint.json

@@ -1,6 +1,6 @@
 {
 	"rules": {
 		"interface-name": [true, "never-prefix"],
-		"whitespace": [false]
-	}
+		"whitespace": [false],
+	},
 }

types/alasql.d.ts

@@ -138,6 +138,22 @@ declare module 'alasql' {
 		[tableName: string]: table;
 	}
 
+	interface Database {
+		databaseid: string;
+		dbversion: number;
+		tables: {[key: string]: any};
+		views: {[key: string]: any};
+		triggers: {[key: string]: any};
+		indices: {[key: string]: any};
+		objects: {[key: string]: any};
+		counter: number;
+		sqlCache: {[key: string]: any};
+		sqlCacheSize: number;
+		astCache: {[key: string]: any};
+		resetSqlCache: () => void;
+		exec: (sql: string, params?: object, cb?: Function) => any;
+		autoval: (tablename: string, colname: string, getNext: boolean) => any;
+	}
 	interface AlaSQL {
 		options: AlaSQLOptions;
 		error: Error;
@@ -150,6 +166,7 @@ declare module 'alasql' {
 		autoval(tablename: string, colname: string, getNext?: boolean): number;
 		yy: {};
 		setXLSX(xlsxlib: typeof xlsx): void;
+		Database: Database;
 
 		/**
 		 * Array of databases in the AlaSQL object.