Merge branch 'develop' into dependabot/npm_and_yarn/form-data-4.0.4

Author: mathiasrw

.github/workflows/scorecard.yml

@@ -53,6 +53,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/upload-sarif@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
         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.6.6",
+	"version": "4.7.0",
 	"author": "Andrey Gershun <[email protected]>",
 	"contributors": [
 		"Mathias Wulff <[email protected]>"
@@ -52,17 +52,17 @@
 		"blueimp-md5": "2.19.0",
 		"cmdmix": "2.2.2",
 		"dom-storage": "2.1.0",
-		"esbuild": "0.25.2",
+		"esbuild": "0.25.12",
 		"git-branch-is": "4.0.0",
 		"husky": "9.1.7",
 		"jison": "^0.4.18",
-		"mocha": "11.1.0",
+		"mocha": "11.7.4",
 		"mocha.parallel": "0.15.6",
-		"open": "10.1.1",
-		"prettier": "3.5.3",
+		"open": "10.2.0",
+		"prettier": "3.6.2",
 		"react-native-fetch-blob": "^0.10.8",
 		"react-native-fs": "^2.20.0",
-		"rexreplace": "7.1.12",
+		"rexreplace": "7.1.13",
 		"strftime": "0.10.3",
 		"tabletop": "1.6.3",
 		"uglify-js": "3.19.3"

src/15utility.js

@@ -442,6 +442,19 @@ async function fetchData(path, success, error, async) {
 }
 
 function getData(path, success, error) {
+	return _fetch(path)
+		.then(response => response.text())
+		.then(txt => {
+			success(txt);
+		})
+		.catch(e => {
+			if (error) return error(e);
+			console.error(e);
+			throw e;
+		});
+}
+
+function getBinaryData(path, success, error) {
 	return _fetch(path)
 		.then(response => response.arrayBuffer())
 		.then(buf => {
@@ -481,7 +494,7 @@ var loadBinaryFile = (utils.loadBinaryFile = function (
 		fs = require('fs');
 
 		if (/^[a-z]+:\/\//i.test(path)) {
-			fetchData(path, success, error, runAsync);
+			return getBinaryData(path, success, error);
 		} else {
 			if (runAsync) {
 				fs.readFile(path, function (err, data) {

test/test157.js

@@ -10,7 +10,7 @@ describe('Test 157 - json()', function () {
 	it('1. Load text data from file async', function (done) {
 		alasql('select * from json("' + __dirname + '/test157.json")', [], function (res) {
 			//			console.log(13,res);
-			assert.deepEqual(res, [{a: 1}, {a: 2}]);
+			assert.deepEqual(res, [{a: 1}, {a: 2}, {c: '😂'}]);
 			done();
 		});
 	});

test/test157.json

@@ -1 +1 @@
-[{"a": 1}, {"a": 2}]
+[{"a": 1}, {"a": 2}, {"c": "😂"}]

test/test2112.dat

@@ -0,0 +1 @@
+�

test/test2112.js

@@ -0,0 +1,28 @@
+if (typeof exports === 'object') {
+	var assert = require('assert');
+	var alasql = require('..');
+}
+
+describe('Test 2112 - load binary file', function () {
+	const test = '2112'; // insert test file number
+
+	it('A) Loads binary file (sync)', function () {
+		alasql.utils.loadBinaryFile('./test/test' + test + '.dat', false, function (data) {
+			assert.equal(data, '�');
+		});
+	});
+
+	it('B) Loads binary file (async)', function (done) {
+		alasql.utils.loadBinaryFile('./test/test' + test + '.dat', true, function (data) {
+			assert.equal(data, '�');
+			done();
+		});
+	});
+
+	it('C) Loads HTTPS binary file (async)', function (done) {
+		alasql.utils.loadBinaryFile('https://upload.wikimedia.org/wikipedia/en/a/a9/Example.jpg', true, function (data) {
+			assert.equal(data.slice(0, 3), 'ÿØÿ');
+			done();
+		});
+	});
+});

test/test418.js

@@ -8,6 +8,8 @@ if (typeof exports === 'object') {
 	Test for issue #379
 */
 
+let baseUrl = "github.com/AlaSQL/alasql/raw/refs/heads/develop"
+
 var test = 418;
 
 describe('Test ' + test + ' Load data from internet', function () {
@@ -38,7 +40,7 @@ describe('Test ' + test + ' Load data from internet', function () {
 	}
 
 	describe('.xlsx from URL', function () {
-		var url = 'raw.githubusercontent.com/agershun/alasql/develop/test/test411.xlsx';
+		var url = baseUrl + '/test/test411.xlsx';
 
 		it('Load http', function (done) {
 			this.timeout(10000);
@@ -52,7 +54,7 @@ describe('Test ' + test + ' Load data from internet', function () {
 	});
 
 	describe('.xls from URL', function () {
-		var url = 'raw.githubusercontent.com/agershun/alasql/develop/test/test168.xls';
+		var url = baseUrl + '/test/test168.xls';
 
 		it('Load http', function (done) {
 			this.timeout(10000);
@@ -66,21 +68,21 @@ describe('Test ' + test + ' Load data from internet', function () {
 	});
 
 	describe('.json from URL', function () {
-		var url = 'raw.githubusercontent.com/agershun/alasql/develop/test/test157.json';
+		var url = baseUrl + '/test/test157.json';
 
 		it('Load http', function (done) {
 			this.timeout(2000);
-			testRequest(2, 'http://' + url, 'false', done);
+			testRequest(3, 'http://' + url, 'false', done);
 		});
 
 		it('Load https', function (done) {
 			this.timeout(10000);
-			testRequest(2, 'https://' + url, 'false', done);
+			testRequest(3, 'https://' + url, 'false', done);
 		});
 	});
 
 	xdescribe('.tab from URL', function () {
-		var url = 'raw.githubusercontent.com/agershun/alasql/develop/test/test157.tab';
+		var url = baseUrl + '/test/test157.tab';
 
 		it('Load http', function (done) {
 			this.timeout(10000);
@@ -94,7 +96,7 @@ describe('Test ' + test + ' Load data from internet', function () {
 	});
 
 	describe('.txt from URL', function () {
-		var url = 'raw.githubusercontent.com/agershun/alasql/develop/test/test157.txt';
+		var url = baseUrl + '/test/test157.txt';
 
 		it('Load http', function (done) {
 			this.timeout(10000);
@@ -108,7 +110,7 @@ describe('Test ' + test + ' Load data from internet', function () {
 	});
 
 	describe('.csv from URL', function () {
-		var url = 'raw.githubusercontent.com/agershun/alasql/develop/test/test157a.csv';
+		var url = baseUrl + '/test/test157a.csv';
 
 		it('Load http', function (done) {
 			this.timeout(10000);