alasql 2.1.0 → 2.1.2

package/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": "2.1.0",
+	"version": "2.1.2",
 	"author": "Andrey Gershun <agershun@gmail.com>",
 	"contributors": [
 		"Mathias Wulff <m@rawu.dk>"
@@ -14,14 +14,14 @@
 	"typings": "dist/alasql.d.ts",
 	"scripts": {
 		"test": "gulp && yarn test-only",
-		"test-ci": "(yarn test-format || 1) && yarn test",
+		"test-ci": "(yarn test-format || 1) && yarn test && yarn install-g && alasql 'select 1 as Succes'",
 		"test-only": "mocha ./test --reporter dot",
 		"test-browser": "node test/browserTestRunner.js 7387",
 		"test-cover": "# istanbul cover  -x 'lib/zt/zt.js' --dir test/coverage _mocha",
 		"build": "yarn format && gulp",
 		"build-jison": "gulp --jison && gulp",
 		"build-watch": "gulp watch",
-		"uptodate": "yarn-check -u --skip-unused",
+		"install-g": "yarn build && npm uninstall alasql -g && npm install -g .",
 		"release": "yarn version #f='/tmp/alasql.tmp' && curl https://raw.githubusercontent.com/wiki/agershun/alasql/How-to-release.md > $f && sh $f ; rm $f",
 		"jison": "npx jison-gho ./src/alasqlparser.jison -o ./src/alasqlparser.js",
 		"fmt": "yarn pretty-commit --write",
@@ -52,10 +52,10 @@
 	"dependencies": {
 		"dom-storage": "^2.1.0",
 		"es6-promise": "^4.2.6",
-		"lodash": "4.17.21",
-		"request": "2.88.2",
-		"xlsx": "^0.18.5",
-		"yargs": "^17.4.1"
+		"lodash": "^4.17.21",
+		"request": "^2.88.2",
+		"xlsx": "^0.18",
+		"yargs": "^16"
 	},
 	"devDependencies": {
 		"blueimp-md5": "2.19.0",
@@ -78,11 +78,11 @@
 		"prettier": "2.7.1",
 		"strftime": "0.10.1",
 		"tabletop": "1.6.3",
-		"uglify-js": "3.17.2"
+		"uglify-js": "3.17.3"
 	},
 	"resolutions": {
 		"got": "^12.0.0",
-		"axios": "^0.27.0",
+		"axios": "^1.0.0",
 		"marked": "^4.0.10",
 		"underscore": "^1.12.1",
 		"glob-parent": "^6.0.0",
@@ -99,8 +99,7 @@
 		"url": "https://github.com/agershun/alasql/issues"
 	},
 	"bin": {
-		"alasql": "./bin/alasql-cli.js",
-		"alaserver": "./bin/alaserver.js"
+		"alasql": "./bin/alasql-cli.js"
 	},
 	"homepage": "https://github.com/agershun/alasql",
 	"keywords": [

package/dist/alasql-echo.js~7d0ef547 (Added test for OUTER JOIN with missing ids)

@@ -1,18 +0,0 @@
-// Plugin sample
-
-var yy = alasql.yy;
-
-yy.Echo = function (params) { return yy.extend(this, params); }
-yy.Echo.prototype.toString = function() {
-	var s =  'TEST '+this.expr.toString();
-	return s;
-}
-
-yy.Echo.prototype.execute = function (databaseid, params, cb) {
-//	var self = this;
-	// console.log(76336,this.expr.toJS());
-	var fn = new Function('params, alasql','return '+this.expr.toJS());
-	var res = fn(params, alasql);
-	if(cb) res = cb(res);
-	return res;
-}

package/dist/alasql-prolog.js~7d0ef547 (Added test for OUTER JOIN with missing ids)

@@ -1,40 +0,0 @@
-// Prolog plugin
-
-var yy = alasql.yy;
-
-yy.Term = function (params) { return yy.extend(this, params); }
-yy.Term.prototype.toString = function() {
-	var s = this.termid;
-	if(this.args && this.args.length > 0) {
-		s += '('+this.args.map(function(arg){
-			return arg.toString();
-		})+')';
-	}
-	return s;
-};
-
-yy.AddRule = function (params) { return yy.extend(this, params); }
-yy.AddRule.prototype.toString = function() {
-	var s = '';
-	if(this.left) s += this.left.toString();
-	s += ':-';
-	s += this.right.map(function(r){return r.toString()}).join(',');
-	return s;
-};
-
-yy.AddRule.prototype.execute = function (databaseid, params, cb) {
-//	var self = this;
-//	console.log(this.expr.toJS());
-//	var fn = new Function('params, alasql','return '+this.expr.toJS());
-//	var res = fn(params, alasql);
-	var res = 1;
-	var objects = alasql.databases[databaseid].objects;
-	var rule = {};
-	if(!this.left) {
-		this.right.forEach(function(term){
-			rule.$class = term.termid;
-		});
-	}
-	if(cb) res = cb(res);
-	return res;
-};

package/dist/alasql-worker.js~7d0ef547 (Added test for OUTER JOIN with missing ids)

@@ -1,245 +0,0 @@
-//! AlaSQL v0.4.11-develop-977878caundefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
-/*
-@module alasql
-@version 0.4.11-develop-977878caundefined
-
-AlaSQL - JavaScript SQL database
-© 2014-2016	Andrey Gershun & Mathias Rangel Wulff
-
-@license
-The MIT License (MIT)
-
-Copyright 2014-2016 Andrey Gershun (agershun@gmail.com) & Mathias Rangel Wulff (m@rawu.dk)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/*
-//
-// AlaSQL Workker
-// Date: 13.04.2014
-// (c) 2014-2015, Andrey Gershun
-//
-*/
-(function (root, factory) {
-    if (typeof define === 'function' && define.amd) {
-        define([], factory);
-    } else if (typeof exports === 'object') {
-        module.exports = factory();
-    } else {
-        root.alasql = factory();
-    }
-}(this, function () {
-
-/**
-	Main procedure for worker
-    @function
-    @param {string} sql SQL statement
-    @param {object} params List of parameters (can be omitted)
-    @param {callback} cb Callback function
-    @return {object} Query result
-*/
-function alasql(sql,params,cb){
-
-	params = params||[];
-
-	// Avoid setting params if not needed even with callback
-	if(typeof params === 'function'){
-		scope = cb;
-		cb = params;
-		params = [];
-	}
-
-	if(typeof params !== 'object'){
-			params = [params];
-	}
-
-    // Increase last request id
-	var id = alasql.lastid++;
-    // Save callback
-	alasql.buffer[id] = cb;
-    // Send a message to worker
-	alasql.webworker.postMessage({id:id,sql:sql,params:params});
-}
-
-
-alasql.options = {};
-alasql.options.progress = function(){};
-
-isArray = function(obj){
-	return "[object Array]"===Object.prototype.toString.call(obj);
-}
-
-alasql.promise = function() {
-	throw new Error('Please include a Promise/A+ library');
-}
-
-// From src/18promise.js
-if(typeof Promise !== "undefined"){
-	var promiseExec = function(sql, params, counterStep, counterTotal){
-		 return new Promise(function(resolve, reject){
-	        alasql(sql, params, function(data,err) {
-	             if(err) {
-	                 reject(err);
-	             } else {
-					if (counterStep && counterTotal && alasql.options.progress !== false) {
-						alasql.options.progress(counterStep, counterTotal);
-					}
-	                resolve(data);
-	             }
-	        });
-	    });
-	}
-
-	var promiseAll = function(sqlParamsArray){
-		if(sqlParamsArray.length<1){
-			return ;
-		}
-
-		var active, sql, params;
-
-		var execArray = []; 
-
-		for (var i = 0; i < sqlParamsArray.length; i++) {
-			active = sqlParamsArray[i];
-
-			if(typeof active === 'string'){
-				active = [active];
-			}
-
-			if(!isArray(active) || active.length<1 || 2<active.length){
-				throw new Error('Error in .promise parameter');
-			}
-
-			sql = active[0];
-			params = active[1]||undefined;
-
-			execArray.push(promiseExec(sql, params, i, sqlParamsArray.length));
-		}
-
-		return Promise.all(execArray); 
-	}
-
-	alasql.promise = function(sql, params) {
-		if(typeof Promise === "undefined"){
-			throw new Error('Please include a Promise/A+ library');
-		}
-
-		if(typeof sql === 'string'){
-			return promiseExec(sql, params);
-		}
-
-		if(!isArray(sql) || sql.length<1 || typeof params !== "undefined"){
-			throw new Error('Error in .promise parameters');
-		}
-		return promiseAll(sql);
-	};
-
-}
-
-
-alasql = alasql || false;
-
-if (!alasql) {
-	throw new Error('alasql was not found');
-}
-
-alasql.worker = function() {
-	throw new Error('Can find webworker in this enviroment');
-};
-
-if (typeof Worker !== 'undefined') {
-	alasql.worker = function(path, paths, cb) {
-		//	var path;
-		if (path === true) {
-			path = undefined;
-		}
-
-		if (typeof path === 'undefined') {
-			var sc = document.getElementsByTagName('script');
-			for (var i = 0; i < sc.length; i++) {
-				if (sc[i].src.substr(-16).toLowerCase() === 'alasql-worker.js') {
-					path = sc[i].src.substr(0, sc[i].src.length - 16) + 'alasql.js';
-					break;
-				} else if (sc[i].src.substr(-20).toLowerCase() === 'alasql-worker.min.js') {
-					path = sc[i].src.substr(0, sc[i].src.length - 20) + 'alasql.min.js';
-					break;
-				} else if (sc[i].src.substr(-9).toLowerCase() === 'alasql.js') {
-					path = sc[i].src;
-					break;
-				} else if (sc[i].src.substr(-13).toLowerCase() === 'alasql.min.js') {
-					path = sc[i].src.substr(0, sc[i].src.length - 13) + 'alasql.min.js';
-					break;
-				}
-			}
-		}
-
-		if (typeof path === 'undefined') {
-			throw new Error('Path to alasql.js is not specified');
-		} else if (path !== false) {
-			var js = "importScripts('";
-			js += path;
-			js +=
-				"');self.onmessage = function(event) {" +
-				'alasql(event.data.sql,event.data.params, function(data){' +
-				'postMessage({id:event.data.id, data:data});});}';
-
-			var blob = new Blob([js], {type: 'text/plain'});
-			alasql.webworker = new Worker(URL.createObjectURL(blob));
-
-			alasql.webworker.onmessage = function(event) {
-				var id = event.data.id;
-
-				alasql.buffer[id](event.data.data);
-				delete alasql.buffer[id];
-			};
-
-			alasql.webworker.onerror = function(e) {
-				throw e;
-			};
-
-			if (arguments.length > 1) {
-				var sql =
-					'REQUIRE ' +
-					paths
-						.map(function(p) {
-							return '"' + p + '"';
-						})
-						.join(',');
-				alasql(sql, [], cb);
-			}
-		} else if (path === false) {
-			delete alasql.webworker;
-			return;
-		}
-	};
-}
-
-
-/* WebWorker */
-/** @type {number} */
-alasql.lastid = 0;
-
-/** @type {object} */
-alasql.buffer = {};
-
-alasql.worker();
-
-return alasql;
-}));

package/dist/alasql-worker.min.js~7d0ef547 (Added test for OUTER JOIN with missing ids)

@@ -1,2 +0,0 @@
-//! AlaSQL v0.4.11-develop-977878caundefined | © 2014-2018 Andrey Gershun & Mathias Rangel 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 r(e,t,o){t=t||[],"function"==typeof t&&(scope=o,o=t,t=[]),"object"!=typeof t&&(t=[t]);var n=r.lastid++;r.buffer[n]=o,r.webworker.postMessage({id:n,sql:e,params:t})}if(r.options={},r.options.progress=function(){},isArray=function(r){return"[object Array]"===Object.prototype.toString.call(r)},r.promise=function(){throw new Error("Please include a Promise/A+ library")},"undefined"!=typeof Promise){var e=function(e,t,o,n){return new Promise(function(s,i){r(e,t,function(e,t){t?i(t):(o&&n&&!1!==r.options.progress&&r.options.progress(o,n),s(e))})})},t=function(r){if(!(r.length<1)){for(var t,o,n,s=[],i=0;i<r.length;i++){if(t=r[i],"string"==typeof t&&(t=[t]),!isArray(t)||t.length<1||2<t.length)throw new Error("Error in .promise parameter");o=t[0],n=t[1]||void 0,s.push(e(o,n,i,r.length))}return Promise.all(s)}};r.promise=function(r,o){if("undefined"==typeof Promise)throw new Error("Please include a Promise/A+ library");if("string"==typeof r)return e(r,o);if(!isArray(r)||r.length<1||void 0!==o)throw new Error("Error in .promise parameters");return t(r)}}if(!(r=r||!1))throw new Error("alasql was not found");return r.worker=function(){throw new Error("Can find webworker in this enviroment")},"undefined"!=typeof Worker&&(r.worker=function(e,t,o){if(!0===e&&(e=void 0),void 0===e)for(var n=document.getElementsByTagName("script"),s=0;s<n.length;s++){if("alasql-worker.js"===n[s].src.substr(-16).toLowerCase()){e=n[s].src.substr(0,n[s].src.length-16)+"alasql.js";break}if("alasql-worker.min.js"===n[s].src.substr(-20).toLowerCase()){e=n[s].src.substr(0,n[s].src.length-20)+"alasql.min.js";break}if("alasql.js"===n[s].src.substr(-9).toLowerCase()){e=n[s].src;break}if("alasql.min.js"===n[s].src.substr(-13).toLowerCase()){e=n[s].src.substr(0,n[s].src.length-13)+"alasql.min.js";break}}if(void 0===e)throw new Error("Path to alasql.js is not specified");if(!1!==e){var i="importScripts('";i+=e,i+="');self.onmessage = function(event) {alasql(event.data.sql,event.data.params, function(data){postMessage({id:event.data.id, data:data});});}";var a=new Blob([i],{type:"text/plain"});if(r.webworker=new Worker(URL.createObjectURL(a)),r.webworker.onmessage=function(e){var t=e.data.id;r.buffer[t](e.data.data),delete r.buffer[t]},r.webworker.onerror=function(r){throw r},arguments.length>1){r("REQUIRE "+t.map(function(r){return'"'+r+'"'}).join(","),[],o)}}else if(!1===e)return void delete r.webworker}),r.lastid=0,r.buffer={},r.worker(),r});

package/dist/alasql.d.ts~7d0ef547 (Added test for OUTER JOIN with missing ids)

@@ -1,84 +0,0 @@
-// Project: https://github.com/agershun/alasql
-
-import * as xlsx from "xlsx";
-
-declare namespace alaSQLSpace {
-    interface AlaSQLCallback {
-        (data?: any, err?: Error): void;
-    }
-
-    interface AlaSQLOptions {
-        errorlog: boolean;
-        valueof: boolean;
-        dropifnotexists: boolean; // drop database in any case
-        datetimeformat: string; // how to handle DATE and DATETIME types
-        casesensitive: boolean; // table and column names are case sensitive and converted to lower-case
-        logtarget: string; // target for log. Values: 'console', 'output', 'id' of html tag
-        logprompt: boolean; // print SQL at log
-        modifier: any; // values: RECORDSET, VALUE, ROW, COLUMN, MATRIX, TEXTSTRING, INDEX
-        columnlookup: number; // how many rows to lookup to define columns
-        autovertex: boolean; // create vertex if not found
-        usedbo: boolean; // use dbo as current database (for partial T-SQL comaptibility)
-        autocommit: boolean; // the AUTOCOMMIT ON | OFF
-        cache: boolean; // use cache
-        nocount: boolean; // for SET NOCOUNT OFF
-        nan: boolean; // check for NaN and convert it to undefined
-        angularjs: boolean;
-        tsql: boolean;
-        mysql: boolean;
-        postgres: boolean;
-        oracle: boolean;
-        sqlite: boolean;
-        orientdb: boolean;
-    }
-
-    // compiled Statement
-    interface AlaSQLStatement {
-        (params?: any, cb?: AlaSQLCallback, scope?: any): any;
-    }
-
-    // abstract Syntax Tree
-    interface AlaSQLAST {
-        compile(databaseid: string): AlaSQLStatement;
-    }
-
-    // https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/es6-promise/es6-promise.d.ts
-    interface Thenable<T> {
-        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
-        catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-    }
-
-    // see https://github.com/agershun/alasql/wiki/User%20Defined%20Functions
-    interface userDefinedFunction {
-        (x: any): any;
-    }
-    interface userDefinedFunctionLookUp {
-        [x: string]: userDefinedFunction;
-    }
-    // see https://github.com/agershun/alasql/wiki/User%20Defined%20Functions
-    interface userAggregator {
-        (value: any, accumulator: any, stage: number): any;
-    }
-    interface userAggregatorLookUp {
-        [x: string]: userAggregator;
-    }
-
-    interface AlaSQL {
-        options: AlaSQLOptions;
-        error: Error;
-        (sql: any, params?: any, cb?: AlaSQLCallback, scope?: any): any;
-        parse(sql: any): AlaSQLAST;
-        promise(sql: any, params?: any): Thenable<any>;
-        fn: userDefinedFunctionLookUp;
-        aggr: userAggregatorLookUp;
-        autoval(tablename: string, colname: string, getNext?:boolean): number;
-        yy:{};
-        setXLSX(xlsxlib: typeof xlsx): void;
-    }
-}
-
-declare var alasql: alaSQLSpace.AlaSQL;
-declare module 'alasql' {
-    export = alasql;
-}