@balena/abstract-sql-compiler 10.2.4-build-renovate-major-22-node-81f07071cc94780a7385f50254cba5e9d8340e64-1 → 10.2.4-build-tests-ts-beb2503119ff2e479e1da25051d33a021129a9d7-1

package/.versionbot/CHANGELOG.yml

@@ -1,16 +1,23 @@
 - commits:
-    - subject: Update dependency @types/node to v22
-      hash: 81f07071cc94780a7385f50254cba5e9d8340e64
-      body: |
-        Update @types/node from 20.17.24 to 22.13.10
+    - subject: "Tests: convert test/odata/test to typescript"
+      hash: beb2503119ff2e479e1da25051d33a021129a9d7
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: Update dev dependencies
+      hash: 703263fa73aff2253d1a931a5946a027d20c9ff6
+      body: ""
       footer:
         Change-type: patch
         change-type: patch
-      author: balena-renovate[bot]
+      author: Pagan Gazzard
       nested: []
   version: 10.2.4
   title: ""
-  date: 2025-03-19T14:47:14.021Z
+  date: 2025-04-04T13:16:10.504Z
 - commits:
     - subject: "Tests: convert test/abstract-sql/case-when-else.js to typescript"
       hash: 0edb21cc4ee30ead2a6eeb290623f3a0adc7a0fe

package/CHANGELOG.md

@@ -4,9 +4,10 @@ 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.4 - 2025-03-19
+## 10.2.4 - 2025-04-04
 
-* Update dependency @types/node to v22 [balena-renovate[bot]]
+* Tests: convert test/odata/test to typescript [Pagan Gazzard]
+* Update dev dependencies [Pagan Gazzard]
 
 ## 10.2.3 - 2025-03-19
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "10.2.4-build-renovate-major-22-node-81f07071cc94780a7385f50254cba5e9d8340e64-1",
+  "version": "10.2.4-build-tests-ts-beb2503119ff2e479e1da25051d33a021129a9d7-1",
   "description": "A translator for abstract sql into sql.",
   "type": "commonjs",
   "main": "out/AbstractSQLCompiler.js",
@@ -23,23 +23,23 @@
     "@balena/sbvr-types": "^7.1.0 || ^8.0.0 || ^9.0.2"
   },
   "devDependencies": {
-    "@balena/lf-to-abstract-sql": "^5.0.2",
+    "@balena/lf-to-abstract-sql": "^5.0.4",
     "@balena/lint": "^8.2.8",
-    "@balena/odata-parser": "^3.1.0",
-    "@balena/odata-to-abstract-sql": "^7.0.0",
-    "@balena/sbvr-parser": "^1.4.6",
-    "@types/chai": "^4.3.4",
+    "@balena/odata-parser": "^3.1.2",
+    "@balena/odata-to-abstract-sql": "^7.2.0",
+    "@balena/sbvr-parser": "^1.4.9",
+    "@types/chai": "^4.3.20",
     "@types/common-tags": "^1.8.4",
-    "@types/lodash": "^4.17.10",
-    "@types/mocha": "^10.0.8",
-    "@types/node": "^22.0.0",
-    "chai": "^4.3.7",
+    "@types/lodash": "^4.17.16",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^20.17.30",
+    "chai": "^4.5.0",
     "common-tags": "^1.8.2",
-    "husky": "^9.1.6",
-    "lint-staged": "^15.2.10",
-    "mocha": "^11.0.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^15.5.0",
+    "mocha": "^11.2.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.6.2"
+    "typescript": "^5.8.2"
   },
   "lint-staged": {
     "*.js": [
@@ -64,6 +64,6 @@
     "npm": ">=10.7.0"
   },
   "versionist": {
-    "publishedAt": "2025-03-19T14:47:14.379Z"
+    "publishedAt": "2025-04-04T13:16:10.931Z"
   }
 }

package/test/odata/expand.js

@@ -18,9 +18,9 @@ const websqlAgg = mysqlAgg;
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
 	const testFunc = (aggFunc, fields) => (result, sqlEquals) => {
-		it('should select from pilot.*, aggregated licence', () =>
-			sqlEquals(
-				result.query,
+		it('should select from pilot.*, aggregated licence', () => {
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -31,16 +31,17 @@ SELECT (
 	) AS "pilot.licence"
 ) AS "licence", ${remainingPilotFields}
 FROM "pilot"`,
-			));
+			);
+		});
 	};
 	const url = '/pilot?$expand=licence';
 	const urlCount = '/pilot?$expand=licence/$count';
 	test.postgres(url, testFunc(postgresAgg, aliasLicenceFields.join(', ')));
 	test.postgres(urlCount, testFunc(postgresAgg, 'COUNT(*) AS "$count"'));
-	test.mysql.skip(url, testFunc(mysqlAgg, aliasLicenceFields.join(', ')));
-	test.mysql.skip(urlCount, testFunc(mysqlAgg, 'COUNT(*) AS "$count"'));
-	test.websql.skip(url, testFunc(websqlAgg, aliasLicenceFields.join(', ')));
-	test.websql.skip(urlCount, testFunc(websqlAgg, 'COUNT(*) AS "$count"'));
+	test.mysql.fail(url, testFunc(mysqlAgg, aliasLicenceFields.join(', ')));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg, 'COUNT(*) AS "$count"'));
+	test.websql.fail(url, testFunc(websqlAgg, aliasLicenceFields.join(', ')));
+	test.websql.fail(urlCount, testFunc(websqlAgg, 'COUNT(*) AS "$count"'));
 })();
 
 (function () {
@@ -50,8 +51,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -78,8 +79,8 @@ FROM "pilot"`,
 		'/pilot?$expand=can_fly__plane($expand=plane)',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.skip(url, testFunc(mysqlAgg));
-		test.websql.skip(url, testFunc(websqlAgg));
+		test.mysql.fail(url, testFunc(mysqlAgg));
+		test.websql.fail(url, testFunc(websqlAgg));
 	}
 })();
 
@@ -94,8 +95,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -129,16 +130,16 @@ FROM "pilot"`,
 		'/pilot?$expand=can_fly__plane($expand=plane),licence',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.skip(url, testFunc(mysqlAgg));
-		test.websql.skip(url, testFunc(websqlAgg));
+		test.mysql.fail(url, testFunc(mysqlAgg));
+		test.websql.fail(url, testFunc(websqlAgg));
 	}
 })();
 
 (function () {
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -154,8 +155,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$select=licence&$expand=licence';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.skip(url, testFunc(mysqlAgg));
-	test.websql.skip(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg));
+	test.websql.fail(url, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -165,8 +166,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -193,8 +194,8 @@ FROM "pilot"`,
 		'/pilot?$select=id&$expand=can_fly__plane($expand=plane)',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.skip(url, testFunc(mysqlAgg));
-		test.websql.skip(url, testFunc(websqlAgg));
+		test.mysql.fail(url, testFunc(mysqlAgg));
+		test.websql.fail(url, testFunc(websqlAgg));
 	}
 })();
 
@@ -205,8 +206,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -240,16 +241,16 @@ FROM "pilot"`,
 		'/pilot?$select=id,licence&$expand=can_fly__plane($expand=plane),licence',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.skip(url, testFunc(mysqlAgg));
-		test.websql.skip(url, testFunc(websqlAgg));
+		test.mysql.fail(url, testFunc(mysqlAgg));
+		test.websql.fail(url, testFunc(websqlAgg));
 	}
 })();
 
 (function () {
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -265,8 +266,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=can_fly__plane($select=id)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.skip(url, testFunc(mysqlAgg));
-	test.websql.skip(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg));
+	test.websql.fail(url, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -276,8 +277,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc, fields) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -306,25 +307,25 @@ FROM "pilot"`,
 		[['Bind', 0]],
 		testFunc(postgresAgg, 'COUNT(*) AS "$count"'),
 	);
-	test.mysql.skip(
+	test.mysql.fail(
 		url,
 		'GET',
 		[['Bind', 0]],
 		testFunc(mysqlAgg, aliasLicenceFields.join(', ')),
 	);
-	test.mysql.skip(
+	test.mysql.fail(
 		urlCount,
 		'GET',
 		[['Bind', 0]],
 		testFunc(mysqlAgg, 'COUNT(*) AS "$count"'),
 	);
-	test.websql.skip(
+	test.websql.fail(
 		url,
 		'GET',
 		[['Bind', 0]],
 		testFunc(websqlAgg, aliasLicenceFields.join(', ')),
 	);
-	test.websql.skip(
+	test.websql.fail(
 		urlCount,
 		'GET',
 		[['Bind', 0]],
@@ -339,17 +340,16 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
 	FROM (
 		SELECT ${aliasLicenceFields.join(', ')}
-		FROM "licence" AS "pilot.licence",
-			"pilot" AS "pilot.licence.is of-pilot"
-		WHERE "pilot.licence"."id" = "pilot.licence.is of-pilot"."licence"
-		AND ("pilot.licence.is of-pilot"."id") IS NOT NULL AND ("pilot.licence.is of-pilot"."id") = (?)
+		FROM "licence" AS "pilot.licence"
+		LEFT JOIN "pilot" AS "pilot.licence.is of-pilot" ON "pilot.licence"."id" = "pilot.licence.is of-pilot"."licence"
+		WHERE ("pilot.licence.is of-pilot"."id") IS NOT NULL AND ("pilot.licence.is of-pilot"."id") = (?)
 		AND "pilot"."licence" = "pilot.licence"."id"
 	) AS "pilot.licence"
 ) AS "licence", ${remainingPilotFields}
@@ -359,8 +359,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($filter=is_of__pilot/id eq 1)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.skip(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.skip(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
+	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
 })();
 
 (function () {
@@ -370,8 +370,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -388,8 +388,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($orderby=id)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.skip(url, testFunc(mysqlAgg));
-	test.websql.skip(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg));
+	test.websql.fail(url, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -399,8 +399,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore orderby', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -416,8 +416,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($orderby=id)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.skip(urlCount, testFunc(mysqlAgg));
-	test.websql.skip(urlCount, testFunc(websqlAgg));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg));
+	test.websql.fail(urlCount, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -427,8 +427,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -445,8 +445,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($top=10)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.skip(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.skip(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
+	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
 })();
 
 (function () {
@@ -456,8 +456,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore top', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -473,8 +473,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($top=10)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.skip(urlCount, testFunc(mysqlAgg));
-	test.websql.skip(urlCount, testFunc(websqlAgg));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg));
+	test.websql.fail(urlCount, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -484,8 +484,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -502,8 +502,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($skip=10)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.skip(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.skip(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
+	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
 })();
 
 (function () {
@@ -513,8 +513,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore skip', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -530,15 +530,15 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($skip=10)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.skip(urlCount, testFunc(mysqlAgg));
-	test.websql.skip(urlCount, testFunc(websqlAgg));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg));
+	test.websql.fail(urlCount, testFunc(websqlAgg));
 })();
 
 (function () {
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -554,15 +554,15 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=can_fly__plane($select=plane)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.skip(url, testFunc(mysqlAgg));
-	test.websql.skip(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg));
+	test.websql.fail(url, testFunc(websqlAgg));
 })();
 
 (function () {
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) pilot-can fly-plane and ignore select', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -578,8 +578,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=can_fly__plane/$count($select=plane)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.skip(urlCount, testFunc(mysqlAgg));
-	test.websql.skip(urlCount, testFunc(websqlAgg));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg));
+	test.websql.fail(urlCount, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -590,8 +590,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated pilot', () => {
-			sqlEquals(
-				result.query,
+			sqlEquals?.(
+				result,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.trained-pilot".*')} AS "trained__pilot"
@@ -607,6 +607,6 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=trained__pilot';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.skip(url, testFunc(mysqlAgg));
-	test.websql.skip(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg));
+	test.websql.fail(url, testFunc(websqlAgg));
 })();