alasql 4.8.0 → 4.9.0

package/bin/alasql-cli.js

@@ -10,7 +10,6 @@
 let alasql = require('../dist/alasql.fs.js');
 let path = require('path');
 let fs = require('fs');
-let stdin = process.openStdin();
 let yargs = require('yargs')
 	.strict()
 	.usage(
@@ -58,44 +57,73 @@ let yargs = require('yargs')
 	.epilog('\nMore information about the library: www.alasql.org');
 
 let argv = yargs.argv;
-let sql = '';
-let params = [];
-let pipedData = '';
-stdin.on('data', function (chunk) {
-	pipedData += chunk;
-});
 
-if (argv.v) {
-	console.log(alasql.version);
-	process.exit(0);
+// Regex patterns for detecting functions
+const re = {
+	txt: /txt\s*\(\s*\)/i,
+};
+
+// Helper function to check if SQL contains txt() and stdin is piped
+function isPipeData(sql) {
+	return sql && !process.stdin.isTTY && re.txt.test(sql);
 }
 
-if (argv.f) {
-	if (!fs.existsSync(argv.f)) {
+// Helper function to setup stdin handling
+function pipeIsSQL() {
+	const stdin = process.openStdin();
+	let pipedData = '';
+	stdin.on('data', function (chunk) {
+		pipedData += chunk;
+	});
+	stdin.on('end', function () {
+		execute(pipedData, argv._);
+	});
+	return stdin;
+}
+
+// Helper function to load and validate SQL file
+function loadSqlFile(filePath) {
+	if (!fs.existsSync(filePath)) {
 		console.error('Error: file not found');
 		process.exit(1);
 	}
-
-	if (isDirectory(argv.f)) {
+	if (isDirectory(filePath)) {
 		console.error('Error: file expected but directory found');
 		process.exit(1);
 	}
+	return fs.readFileSync(filePath, 'utf8').toString();
+}
+
+// Main execution logic
+function main() {
+	let sql = '';
+	let pipeIsData = false;
+
+	if (argv.f) {
+		sql = loadSqlFile(argv.f);
+		pipeIsData = isPipeData(sql);
+	} else {
+		sql = argv._.shift() || '';
+		pipeIsData = isPipeData(sql);
+	}
 
-	sql = fs.readFileSync(argv.f, 'utf8').toString();
-	execute(sql, argv._);
-} else {
-	sql = argv._.shift() || '';
+	// Setup stdin handling only if not using txt() pipe
+	if (!pipeIsData) {
+		pipeIsSQL();
+	}
 
-	// if data is not piped
-	if (Boolean(process.stdin.isTTY)) {
+	// Execute immediately if we have SQL or are using txt() pipe
+	if (sql || pipeIsData) {
 		execute(sql, argv._);
 	}
 }
 
-// if data is piped
-stdin.on('end', function () {
-	execute(pipedData, argv._);
-});
+if (argv.v) {
+	console.log(alasql.version);
+	process.exit(0);
+}
+
+main();
 
 /**
  * Execute SQL query

package/dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.7.0 build: develop-916ff64e | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.8.0 build: develop-af967432 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.7.0
+@version 4.8.0
 
 AlaSQL - JavaScript SQL database
 © 2014-2024	Andrey Gershun & Mathias Wulff

package/dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.7.0 build: develop-916ff64e | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.8.0 build: develop-af967432 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.7.0
+@version 4.8.0
 
 AlaSQL - JavaScript SQL database
 © 2014-2024	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ SOFTWARE.
 		Current version of alasql
 		  @constant {string}
 	*/
-	alasql.version = '4.7.0';
-	alasql.build = 'develop-916ff64e';
+	alasql.version = '4.8.0';
+	alasql.build = 'develop-af967432';
 
 	/**
 		Debug flag
@@ -3487,7 +3487,7 @@ let loadFile = (utils.loadFile = function (path, asy, success, error) {
 		fs = require('fs');
 
 		// If path is empty, than read data from stdin (for Node)
-		if (typeof path === 'undefined') {
+		if ([null, undefined].includes(path)) {
 			var buff = '';
 			process.stdin.setEncoding('utf8');
 			process.stdin.on('readable', function () {

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v4.7.0 build: develop-916ff64e | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
+//! AlaSQL v4.8.0 build: develop-af967432 | © 2014-2024 Andrey Gershun & Mathias Wulff | License: MIT
 /*
 @module alasql
-@version 4.7.0
+@version 4.8.0
 
 AlaSQL - JavaScript SQL database
 © 2014-2024	Andrey Gershun & Mathias Wulff
@@ -141,8 +141,8 @@ SOFTWARE.
 		Current version of alasql
 		  @constant {string}
 	*/
-	alasql.version = '4.7.0';
-	alasql.build = 'develop-916ff64e';
+	alasql.version = '4.8.0';
+	alasql.build = 'develop-af967432';
 
 	/**
 		Debug flag
@@ -3487,7 +3487,7 @@ let loadFile = (utils.loadFile = function (path, asy, success, error) {
 		fs = require('fs');
 
 		// If path is empty, than read data from stdin (for Node)
-		if (typeof path === 'undefined') {
+		if ([null, undefined].includes(path)) {
 			var buff = '';
 			process.stdin.setEncoding('utf8');
 			process.stdin.on('readable', function () {