Add jsonl support (#1919)

src/15utility.js

@@ -614,7 +614,7 @@ utils.autoExtFilename = function (filename, ext, config) {
 	config = config || {};
 	if (
 		typeof filename !== 'string' ||
-		filename.match(/^[A-z]+:\/\/|\n|\..{2,4}$/) ||
+		filename.match(/^[A-Z]+:\/\/|\n|\..{2,6}$/i) ||
 		config.autoExt === 0 ||
 		config.autoExt === false
 	) {

src/84from.js

@@ -131,10 +131,47 @@ alasql.from.JSON = function (filename, opts, cb, idx, query) {
 		if (cb) {
 			res = cb(res, idx, query);
 		}
-	});
+	}),
+		err => {
+			throw new Error(err);
+		};
 	return res;
 };
 
+const jsonl = ext => {
+	return function (filename, opts, cb, idx, query) {
+		let out = [];
+		filename = alasql.utils.autoExtFilename(filename, ext, opts);
+		alasql.utils.loadFile(
+			filename,
+			!!cb,
+			function (data) {
+				data.split(/\r?\n/).forEach((line, ix) => {
+					const trimmed = line.trim();
+					if (trimmed !== '') {
+						// skip empty lines, we do not use filter on an input, as we want to preserve line numbers
+						try {
+							out.push(JSON.parse(trimmed));
+						} catch (e) {
+							throw new Error(`Could not parse JSON at line ${ix}: ${e.toString()}`);
+						}
+					}
+				});
+				if (cb) {
+					res = cb(out, idx, query);
+				}
+			},
+			err => {
+				throw new Error(err);
+			}
+		);
+		return out;
+	};
+};
+
+alasql.from.JSONL = jsonl('jsonl');
+alasql.from.NDJSON = jsonl('ndjson');
+
 alasql.from.TXT = function (filename, opts, cb, idx, query) {
 	var res;
 	filename = alasql.utils.autoExtFilename(filename, 'txt', opts);

test/test1919.js

@@ -0,0 +1,51 @@
+if (typeof exports === 'object') {
+	var assert = require('assert');
+	var alasql = require('..');
+}
+
+/*
+	Test for issue #1919
+*/
+describe(`Test 1919 Load data from JSONL file`, function () {
+	const expectedResult = [
+		{
+			a: 'foo',
+			b: 5,
+			c: true,
+			d: null
+		},
+		{
+			a: 'bar',
+			b: 8,
+			c: false,
+			d: null
+		}
+	];
+	it('1. Load JSONL', function (done) {
+		alasql('SELECT * FROM JSONL("' + __dirname + '/test1919")', [], function (res) {
+			assert.deepEqual(res, expectedResult);
+			done();
+		});
+	});
+
+	it('2. Load NDJSON', function (done) {
+		alasql('SELECT * FROM NDJSON("' + __dirname + '/test1919")', [], function (res) {
+			assert.deepEqual(res, expectedResult);
+			done();
+		});
+	});
+
+	it('3. Load NDJSON - will accept file with different  extension', function (done) {
+		alasql('SELECT * FROM NDJSON("' + __dirname + '/test1919.jsonl")', [], function (res) {
+			assert.deepEqual(res, expectedResult);
+			done();
+		});
+	});
+
+	it('4. Load JSONL - will accept file with different extension', function (done) {
+		alasql('SELECT * FROM JSONL("' + __dirname + '/test1919.ndjson")', [], function (res) {
+			assert.deepEqual(res, expectedResult);
+			done();
+		});
+	});
+});

test/test1919.jsonl

@@ -0,0 +1,2 @@
+{"a":"foo","b":5.0,"c":true,"d":null}
+{"a":"bar","b":8.0,"c":false,"d":null}

test/test1919.ndjson

@@ -0,0 +1,2 @@
+{"a":"foo","b":5.0,"c":true,"d":null}
+{"a":"bar","b":8.0,"c":false,"d":null}