@balena/abstract-sql-compiler 10.2.3-build-renovate-major-22-node-d6c0f904df738bdfb51aa65395e2b146a26000e6-1 → 10.2.3-build-tests-0edb21cc4ee30ead2a6eeb290623f3a0adc7a0fe-1

package/.versionbot/CHANGELOG.yml

@@ -1,16 +1,31 @@
 - commits:
-    - subject: Update dependency @types/node to v22
-      hash: d6c0f904df738bdfb51aa65395e2b146a26000e6
-      body: |
-        Update @types/node from 20.17.19 to 22.13.1
+    - subject: "Tests: convert test/abstract-sql/case-when-else.js to typescript"
+      hash: 0edb21cc4ee30ead2a6eeb290623f3a0adc7a0fe
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/abstract-sql/test.js to typescript"
+      hash: 43c24e87e4af08c8dd803a1cc4dfcb8bead301e9
+      body: ""
       footer:
         Change-type: patch
         change-type: patch
-      author: balena-renovate[bot]
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: simplify handling of variadic test helper functions"
+      hash: f07fa0857b22c99c019cb1d3ea04a9b6fa7449e7
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
       nested: []
   version: 10.2.3
   title: ""
-  date: 2025-02-14T17:44:43.552Z
+  date: 2025-03-18T21:29:49.750Z
 - commits:
     - subject: Clarify the `['Bind', string, string]` form of `BindNode` is legacy
       hash: aa72d3c77c2b6dae37d517ca149a27ea7e5a9bc1

package/CHANGELOG.md

@@ -4,9 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 10.2.3 - 2025-02-14
+## 10.2.3 - 2025-03-18
 
-* Update dependency @types/node to v22 [balena-renovate[bot]]
+* Tests: convert test/abstract-sql/case-when-else.js to typescript [Pagan Gazzard]
+* Tests: convert test/abstract-sql/test.js to typescript [Pagan Gazzard]
+* Tests: simplify handling of variadic test helper functions [Pagan Gazzard]
 
 ## 10.2.2 - 2025-02-14
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "10.2.3-build-renovate-major-22-node-d6c0f904df738bdfb51aa65395e2b146a26000e6-1",
+  "version": "10.2.3-build-tests-0edb21cc4ee30ead2a6eeb290623f3a0adc7a0fe-1",
   "description": "A translator for abstract sql into sql.",
   "type": "commonjs",
   "main": "out/AbstractSQLCompiler.js",
@@ -32,7 +32,7 @@
     "@types/common-tags": "^1.8.4",
     "@types/lodash": "^4.17.10",
     "@types/mocha": "^10.0.8",
-    "@types/node": "^22.0.0",
+    "@types/node": "^20.16.10",
     "chai": "^4.3.7",
     "common-tags": "^1.8.2",
     "husky": "^9.1.6",
@@ -64,6 +64,6 @@
     "npm": ">=10.7.0"
   },
   "versionist": {
-    "publishedAt": "2025-02-14T17:44:43.935Z"
+    "publishedAt": "2025-03-18T21:29:50.127Z"
   }
 }

package/test/abstract-sql/aggregate-json.ts

@@ -1,15 +1,4 @@
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('AggregateJSON', () => {
 	test(
@@ -46,7 +35,7 @@ describe('AggregateJSON', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid aggregate JSON statement', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 SELECT (
 	SELECT COALESCE(JSON_AGG("pilot.licence".*), '[]') AS "licence"

package/test/abstract-sql/aggregate.ts

@@ -1,21 +1,10 @@
 import { expect } from 'chai';
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Count', () => {
 	test(['SelectQuery', ['Select', [['Count', '*']]]], (result, sqlEquals) => {
 		it('should produce a valid COUNT(*) statement', () => {
-			sqlEquals(result.query, 'SELECT COUNT(*)');
+			sqlEquals(result, 'SELECT COUNT(*)');
 		});
 	});
 });
@@ -25,7 +14,7 @@ describe('Average', () => {
 		['SelectQuery', ['Select', [['Average', ['Number', 5]]]]],
 		(result, sqlEquals) => {
 			it('should produce a valid AVG(5) statement', () => {
-				sqlEquals(result.query, 'SELECT AVG(5)');
+				sqlEquals(result, 'SELECT AVG(5)');
 			});
 		},
 	);
@@ -36,7 +25,7 @@ describe('Sum', () => {
 		['SelectQuery', ['Select', [['Sum', ['Number', 5]]]]],
 		(result, sqlEquals) => {
 			it('should produce a valid SUM(5) statement', () => {
-				sqlEquals(result.query, 'SELECT SUM(5)');
+				sqlEquals(result, 'SELECT SUM(5)');
 			});
 		},
 	);
@@ -47,7 +36,7 @@ describe('Subtract now timestamp from now timestamp', () => {
 		['SelectQuery', ['Select', [['Subtract', ['Now'], ['Now']]]]],
 		(result, sqlEquals) => {
 			it('Subtract now timestamp from now timestamp', () => {
-				sqlEquals(result.query, 'SELECT CURRENT_TIMESTAMP - CURRENT_TIMESTAMP');
+				sqlEquals(result, 'SELECT CURRENT_TIMESTAMP - CURRENT_TIMESTAMP');
 			});
 		},
 	);
@@ -61,10 +50,7 @@ describe('Subtract Duration from now timestamp', () => {
 		],
 		(result, sqlEquals) => {
 			it('Subtract Duration from now timestamp', () => {
-				sqlEquals(
-					result.query,
-					`SELECT CURRENT_TIMESTAMP - INTERVAL '1 0:0:0.0'`,
-				);
+				sqlEquals(result, `SELECT CURRENT_TIMESTAMP - INTERVAL '1 0:0:0.0'`);
 			});
 		},
 	);
@@ -72,18 +58,11 @@ describe('Subtract Duration from now timestamp', () => {
 
 // this is not allowed
 describe('Add now timestamp to now timestamp should fail', () => {
-	test(
-		['SelectQuery', ['Select', [['Add', ['Now'], ['Now']]]]],
-		(result, sqlEquals) => {
-			it('Add now timestamp to now timestamp should fail', () => {
-				expect(result).to.be.empty;
-				expect(sqlEquals).to.be.undefined;
-				expect(result.query).to.not.eq(
-					'SELECT CURRENT_TIMESTAMP + CURRENT_TIMESTAMP',
-				);
-			});
-		},
-	);
+	test.fail(['SelectQuery', ['Select', [['Add', ['Now'], ['Now']]]]], (err) => {
+		it('Add now timestamp to now timestamp should fail', () => {
+			expect(err).to.be.an('error');
+		});
+	});
 });
 
 describe('Add Duration to now timestamp', () => {
@@ -91,10 +70,7 @@ describe('Add Duration to now timestamp', () => {
 		['SelectQuery', ['Select', [['Add', ['Now'], ['Duration', { day: 1 }]]]]],
 		(result, sqlEquals) => {
 			it('Add Duration to now timestamp', () => {
-				sqlEquals(
-					result.query,
-					`SELECT CURRENT_TIMESTAMP + INTERVAL '1 0:0:0.0'`,
-				);
+				sqlEquals(result, `SELECT CURRENT_TIMESTAMP + INTERVAL '1 0:0:0.0'`);
 			});
 		},
 	);
@@ -123,7 +99,7 @@ describe('Substract DateTrunc datefield from now timestamp', () => {
 		(result, sqlEquals) => {
 			it('Substract DateTrunc datefield from now timestamp', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`SELECT CURRENT_TIMESTAMP - DATE_TRUNC('milliseconds', $1)`,
 				);
 			});
@@ -161,7 +137,7 @@ describe('Substract DateTrunc datefield from now timestamp', () => {
 		(result, sqlEquals) => {
 			it('Substract DateTrunc datefield from now timestamp', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`SELECT DATE_TRUNC('milliseconds', $1) - DATE_TRUNC('milliseconds', $2)`,
 				);
 			});

package/test/abstract-sql/and-or-boolean-optimisations.ts

@@ -1,16 +1,5 @@
 import { stripIndent } from 'common-tags';
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Unnecessary booleans should be removed', () => {
 	test(
@@ -31,7 +20,7 @@ describe('Unnecessary booleans should be removed', () => {
 		(result, sqlEquals) => {
 			it('should simplify `... AND true` to `...`', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1
 						FROM "table"
@@ -59,7 +48,7 @@ describe('Unnecessary booleans should be removed', () => {
 		(result, sqlEquals) => {
 			it('should simplify `... OR false` to `...`', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1
 						FROM "table"
@@ -86,7 +75,7 @@ describe('Unnecessary booleans should be removed', () => {
 		(result, sqlEquals) => {
 			it('should simplify `... AND false` to `false`', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1
 						FROM "table"
@@ -113,7 +102,7 @@ describe('Unnecessary booleans should be removed', () => {
 		(result, sqlEquals) => {
 			it('should simplify `... AND true` to `true`', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1
 						FROM "table"

package/test/abstract-sql/{case-when-else.js → case-when-else.ts}

@@ -1,25 +1,16 @@
+import type { CaseNode, SelectQueryNode } from '../../src/AbstractSQLCompiler';
 import test from './test';
 
-const buildSelect = (withElse) => [
-	'SelectQuery',
-	[
-		'Select',
-		[
-			[
-				'Alias',
-				[
-					'Case',
-					[
-						'When',
-						['Equals', ['Number', -2], ['Number', -2]],
-						['Text', 'Equal'],
-					],
-				].concat(withElse ? [['Else', ['Text', 'Not Equal']]] : []),
-				'equal_alias',
-			],
-		],
-	],
-];
+const buildSelect = (withElse: boolean): SelectQueryNode => {
+	let caseNode: CaseNode = [
+		'Case',
+		['When', ['Equals', ['Number', -2], ['Number', -2]], ['Text', 'Equal']],
+	];
+	if (withElse) {
+		caseNode = [...caseNode, ['Else', ['Text', 'Not Equal']]];
+	}
+	return ['SelectQuery', ['Select', [['Alias', caseNode, 'equal_alias']]]];
+};
 
 test(
 	buildSelect(true),
@@ -30,7 +21,7 @@ test(
 	(result, sqlEquals) => {
 		it('should produce a valid case statement', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT CASE
 	WHEN -2 = -2 THEN ?
@@ -44,7 +35,7 @@ END AS "equal_alias"`,
 test(buildSelect(false), [['Text', 'Equal']], (result, sqlEquals) => {
 	it('should produce a valid case statement without an else', () => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 SELECT CASE
 	WHEN -2 = -2 THEN ?

package/test/abstract-sql/cast.ts

@@ -1,22 +1,11 @@
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Cast', () => {
 	test(
 		['SelectQuery', ['Select', [['Cast', ['Number', 1.2], 'Integer']]]],
 		(result, sqlEquals) => {
 			it('should produce a valid integer cast statement', () => {
-				sqlEquals(result.query, 'SELECT CAST(1.2 AS INTEGER)');
+				sqlEquals(result, 'SELECT CAST(1.2 AS INTEGER)');
 			});
 		},
 	);
@@ -29,7 +18,7 @@ describe('Cast', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid date cast statement', () => {
-				sqlEquals(result.query, `SELECT CAST($1 AS DATE)`);
+				sqlEquals(result, `SELECT CAST($1 AS DATE)`);
 			});
 		},
 	);

package/test/abstract-sql/coalesce.ts

@@ -1,22 +1,11 @@
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Coalesce', () => {
 	test(
 		['SelectQuery', ['Select', [['Coalesce', ['Number', 1], ['Number', 2]]]]],
 		(result, sqlEquals) => {
 			it('should produce a valid coalesce statement', () => {
-				sqlEquals(result.query, 'SELECT COALESCE(1, 2)');
+				sqlEquals(result, 'SELECT COALESCE(1, 2)');
 			});
 		},
 	);
@@ -28,7 +17,7 @@ describe('Coalesce', () => {
 		[['Text', '1']],
 		(result, sqlEquals) => {
 			it('should produce a valid coalesce statement', () => {
-				sqlEquals(result.query, 'SELECT COALESCE($1, NULL, 2)');
+				sqlEquals(result, 'SELECT COALESCE($1, NULL, 2)');
 			});
 		},
 	);

package/test/abstract-sql/comparisons.ts

@@ -1,16 +1,5 @@
 import { stripIndent } from 'common-tags';
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Between', () => {
 	test(
@@ -20,7 +9,7 @@ describe('Between', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid Between statement', () => {
-				sqlEquals(result.query, 'SELECT 5 BETWEEN 3 AND (8)');
+				sqlEquals(result, 'SELECT 5 BETWEEN 3 AND (8)');
 			});
 		},
 	);
@@ -32,7 +21,7 @@ describe('Equals Any', () => {
 		[['Bind', 0]],
 		(result, sqlEquals) => {
 			it('should produce a valid EqualsAny statement', () => {
-				sqlEquals(result.query, 'SELECT 5 = ANY($1)');
+				sqlEquals(result, 'SELECT 5 = ANY($1)');
 			});
 		},
 	);
@@ -56,7 +45,7 @@ describe('Comparison Operator Precedence', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid Equals statement when the second operand is also an Equals', () => {
-				sqlEquals(result.query, 'SELECT TRUE = (TRUE = TRUE)');
+				sqlEquals(result, 'SELECT TRUE = (TRUE = TRUE)');
 			});
 		},
 	);
@@ -77,7 +66,7 @@ describe('Comparison Operator Precedence', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid NotEquals statement when both operands are Equals comparisons', () => {
-				sqlEquals(result.query, 'SELECT (FALSE = FALSE) != (TRUE = TRUE)');
+				sqlEquals(result, 'SELECT (FALSE = FALSE) != (TRUE = TRUE)');
 			});
 		},
 	);
@@ -107,7 +96,7 @@ describe('Comparison Operator Precedence', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid NotEquals statement when the operands are math expressions with nested parenthesis', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1 + (2 + (3 * 4)) != 1 + 0
 					`,
@@ -138,7 +127,7 @@ describe('Comparison Operator Precedence', () => {
 			// Evaluating this would match the expression w/o parenthesis
 			it('should produce a valid NotEquals statement when the operands are math expressions with left sided parenthesis', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT (1 + 2) * 5 >= 12 + 2
 					`,
@@ -169,7 +158,7 @@ describe('Comparison Operator Precedence', () => {
 			// Evaluating this would give a different result than if it was w/o parenthesis
 			it('should produce a valid NotEquals statement when the operands are math expressions with right sided parenthesis', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1 + (2 * 5) >= 12 + 2
 					`,
@@ -199,7 +188,7 @@ describe('Comparison Operator Precedence', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid And statement when the operands are composite boolean expressions', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT (1 > 0
 						OR 1 < 0)
@@ -232,7 +221,7 @@ describe('Comparison Operator Precedence', () => {
 			// Even though the parenthesis are not added around the AND, the expression is correct b/c of precedence.
 			it('should produce a valid Or statement when the first operand is a composite boolean expression', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT (0 > 1
 						AND 0 = 1
@@ -265,7 +254,7 @@ describe('Comparison Operator Precedence', () => {
 			// Even though the parenthesis are not added around the AND, the expression is correct b/c of precedence.
 			it('should produce a valid Or statement when the second operand is a composite boolean expression', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT (1 > 0
 						OR 0 = 1
@@ -298,7 +287,7 @@ describe('Comparison Operator Precedence', () => {
 			// If it was w/o parenthesis, evaluating this would give a different result
 			it('should produce a valid And statement when the first operand is an Or boolean expressions', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT (1 > 0
 						OR 0 = 1)
@@ -331,7 +320,7 @@ describe('Comparison Operator Precedence', () => {
 			// If it was w/o parenthesis, evaluating this would give a different result
 			it('should produce a valid And statement when the second operand is an Or boolean expressions', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 0 > 1
 						AND (0 = 1
@@ -360,7 +349,7 @@ describe('Comparison Operator Precedence', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid Between statement when the operands are math expressions', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1 + 0 BETWEEN 1 + 0 AND (1 + 0)
 					`,