Fix negative numbers in JSON contexts to close #475 (#2298)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: mathiasrw <[email protected]>
Co-authored-by: M. Wulff <[email protected]>

Author: Copilot

.gitattributes

@@ -12,4 +12,6 @@ yarn.lock binary
 # paths that don't start with / are relative to the .gitattributes folder
 #relative/path/*.txt text eol=lf
 
+src/alasqlparser.js merge=union
+
 

src/alasqlparser.jison

@@ -2485,6 +2485,8 @@ JsonValue
 JsonPrimitiveValue
 	: NumValue
 		{ $$ = +$1.value; }
+	| MINUS NumValue
+		{ $$ = -$2.value; }
 	| StringValue
 		{ $$ = ""+$1.value; }
 	| LogicValue
@@ -2534,6 +2536,12 @@ JsonProperty
 		{ $$ = {}; $$[$1] = $3; }
 	| Literal COLON JsonValue
 		{ $$ = {}; $$[$1] = $3; }
+	| STRING COLONDASH NumValue
+		{ $$ = {}; $$[$1.substr(1,$1.length-2)] = -$3.value; }
+	| NUMBER COLONDASH NumValue
+		{ $$ = {}; $$[$1] = -$3.value; }
+	| Literal COLONDASH NumValue
+		{ $$ = {}; $$[$1] = -$3.value; }
 /*	| STRING COLON ParamValue
 		{ $$ = {}; $$[$1.substr(1,$1.length-2)] = $3; }
 	| NUMBER COLON ParamValue

src/alasqlparser.js

@@ -0,0 +1,54 @@
+if (typeof exports === 'object') {
+	var assert = require('assert');
+	var alasql = require('..');
+}
+
+describe('Test 2201 - JSON with negative numbers', function () {
+	const test = '2201';
+
+	it('A) JSON array with negative numbers in objects', function () {
+		var res = alasql('SELECT * FROM @[{delay:5},{delay:-7}]');
+		assert.deepEqual(res, [{delay: 5}, {delay: -7}]);
+	});
+
+	it('B) JSON object with negative number property', function () {
+		var res = alasql('SELECT VALUE @{a:-5}');
+		assert.deepEqual(res, {a: -5});
+	});
+
+	it('C) JSON array with multiple negative numbers', function () {
+		var res = alasql('SELECT * FROM @[{x:-1,y:-2},{x:-3,y:-4}]');
+		assert.deepEqual(res, [
+			{x: -1, y: -2},
+			{x: -3, y: -4},
+		]);
+	});
+
+	it('D) JSON with mix of positive and negative numbers', function () {
+		var res = alasql('SELECT * FROM @[{a:10,b:-10},{a:-5,b:5}]');
+		assert.deepEqual(res, [
+			{a: 10, b: -10},
+			{a: -5, b: 5},
+		]);
+	});
+
+	it('E) JSON with negative decimal numbers', function () {
+		var res = alasql('SELECT * FROM @[{val:-3.14},{val:-2.5}]');
+		assert.deepEqual(res, [{val: -3.14}, {val: -2.5}]);
+	});
+
+	it('F) Array literals with negative numbers', function () {
+		var res = alasql('SELECT @[-1.7,-2,-3] AS arr');
+		assert.deepEqual(res, [{arr: [-1.7, -2, -3]}]);
+	});
+
+	it('G) Nested JSON with negative numbers', function () {
+		var res = alasql('SELECT VALUE @{"outer":{"inner":-3.3}}');
+		assert.deepEqual(res, {outer: {inner: -3.3}});
+	});
+
+	it('H) Nested object in array with negative numbers', function () {
+		var res = alasql('SELECT * FROM @[{"data":{"value":-10.5}}]');
+		assert.deepEqual(res, [{data: {value: -10.5}}]);
+	});
+});