@balena/abstract-sql-compiler 10.2.5-build-tests-ts-c00e9270589111b882d4894fc437dd8b0343ecce-1 → 10.2.6-build-ts-tests-3f2373a4482584aa493652784bd2041a8b7b9314-1

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,87 @@
+- commits:
+    - subject: "Tests: convert test/sbvr/reference-type to typescript"
+      hash: c41377f6f468c2c4006399e19117153837b503e6
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/sbvr/pilots to typescript"
+      hash: a275ef78d116e2768f95c402b1bcbcf79b1e0079
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/sbvr/test to typescript"
+      hash: 18ec8de28eb80b2d1d3ec46cc7550dbbe8b4b9e6
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/odata/expand to typescript"
+      hash: 031750d479e9c67293c489ccd93436d33aa668f9
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/odata/filterby to typescript"
+      hash: 206aaf4363007e81f5d54d4bf957835b184fcf94
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/odata/orderby to typescript"
+      hash: 1bd82f39836a28017436090307fb6d2646396d69
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/odata/paging to typescript"
+      hash: fec1912620feecf5c6ab596680cec2909bfdcb1b
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/odata/resource_parsing to typescript"
+      hash: 601c5256a8ac7acd00ae3f978365eab44782448e
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/odata/select to typescript"
+      hash: 75492ad8a054b7178cb2579c61cfa98a191d49b8
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: convert test/odata/stress to typescript"
+      hash: 35caa5820914c0ca082f7784ff4c54c5245cefcc
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+  version: 10.2.6
+  title: ""
+  date: 2025-04-07T11:05:19.400Z
 - commits:
     - subject: "Tests: convert test/odata/test to typescript"
       hash: c00e9270589111b882d4894fc437dd8b0343ecce
@@ -9,7 +93,7 @@
       nested: []
   version: 10.2.5
   title: ""
-  date: 2025-04-06T22:37:16.638Z
+  date: 2025-04-06T22:40:57.152Z
 - commits:
     - subject: Update dev dependencies
       hash: 703263fa73aff2253d1a931a5946a027d20c9ff6

package/CHANGELOG.md

@@ -4,6 +4,19 @@ 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.6 - 2025-04-07
+
+* Tests: convert test/sbvr/reference-type to typescript [Pagan Gazzard]
+* Tests: convert test/sbvr/pilots to typescript [Pagan Gazzard]
+* Tests: convert test/sbvr/test to typescript [Pagan Gazzard]
+* Tests: convert test/odata/expand to typescript [Pagan Gazzard]
+* Tests: convert test/odata/filterby to typescript [Pagan Gazzard]
+* Tests: convert test/odata/orderby to typescript [Pagan Gazzard]
+* Tests: convert test/odata/paging to typescript [Pagan Gazzard]
+* Tests: convert test/odata/resource_parsing to typescript [Pagan Gazzard]
+* Tests: convert test/odata/select to typescript [Pagan Gazzard]
+* Tests: convert test/odata/stress to typescript [Pagan Gazzard]
+
 ## 10.2.5 - 2025-04-06
 
 * Tests: convert test/odata/test to typescript [Pagan Gazzard]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "10.2.5-build-tests-ts-c00e9270589111b882d4894fc437dd8b0343ecce-1",
+  "version": "10.2.6-build-ts-tests-3f2373a4482584aa493652784bd2041a8b7b9314-1",
   "description": "A translator for abstract sql into sql.",
   "type": "commonjs",
   "main": "out/AbstractSQLCompiler.js",
@@ -11,8 +11,8 @@
     "test": "mocha",
     "posttest": "npm run lint",
     "prepare": "node -e \"try { (await import('husky')).default() } catch (e) { if (e.code !== 'ERR_MODULE_NOT_FOUND') throw e }\" --input-type module && npm run build",
-    "lint-fix": "balena-lint --fix -e js -e ts src/ test/",
-    "lint": "balena-lint -e js -e ts src/ test/ && tsc --noEmit && tsc --noEmit --project tsconfig.js.json"
+    "lint-fix": "balena-lint --fix src/ test/",
+    "lint": "balena-lint src/ test/ && tsc --noEmit"
   },
   "repository": "https://github.com/balena-io-modules/abstract-sql-compiler.git",
   "author": "",
@@ -42,9 +42,6 @@
     "typescript": "^5.8.2"
   },
   "lint-staged": {
-    "*.js": [
-      "balena-lint --fix"
-    ],
     "*.ts": [
       "balena-lint --fix"
     ]
@@ -54,16 +51,13 @@
     "recursive": true,
     "require": "ts-node/register/transpile-only",
     "bail": true,
-    "_": [
-      "test/**/*.ts",
-      "test/**/*.js"
-    ]
+    "_": "test/**/*.ts"
   },
   "engines": {
     "node": ">=20.14.0",
     "npm": ">=10.7.0"
   },
   "versionist": {
-    "publishedAt": "2025-04-06T22:37:17.012Z"
+    "publishedAt": "2025-04-07T11:05:19.874Z"
   }
 }

package/test/odata/{expand.js → expand.ts}

@@ -1,3 +1,4 @@
+import type { ExpectationFailFn, ExpectationSuccessFn } from './test';
 import test from './test';
 import {
 	pilotFields,
@@ -8,8 +9,15 @@ import {
 } from './fields';
 import _ from 'lodash';
 
-const postgresAgg = (field) => 'COALESCE(JSON_AGG(' + field + "), '[]')";
-const mysqlAgg = (field) => "'[' || group_concat(" + field + ", ',') || ']'";
+type TestFn = (
+	aggFunc: (field: string) => string,
+	fields?: string,
+) => ExpectationSuccessFn;
+
+const postgresAgg = (field: string) =>
+	'COALESCE(JSON_AGG(' + field + "), '[]')";
+const mysqlAgg = (field: string) =>
+	"'[' || group_concat(" + field + ", ',') || ']'";
 const websqlAgg = mysqlAgg;
 
 (function () {
@@ -17,7 +25,7 @@ const websqlAgg = mysqlAgg;
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc, fields) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc, fields) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -38,10 +46,28 @@ FROM "pilot"`,
 	const urlCount = '/pilot?$expand=licence/$count';
 	test.postgres(url, testFunc(postgresAgg, aliasLicenceFields.join(', ')));
 	test.postgres(urlCount, testFunc(postgresAgg, '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"'));
+	test.mysql.fail(
+		url,
+		testFunc(
+			mysqlAgg,
+			aliasLicenceFields.join(', '),
+		) as any as ExpectationFailFn,
+	);
+	test.mysql.fail(
+		urlCount,
+		testFunc(mysqlAgg, 'COUNT(*) AS "$count"') as any as ExpectationFailFn,
+	);
+	test.websql.fail(
+		url,
+		testFunc(
+			websqlAgg,
+			aliasLicenceFields.join(', '),
+		) as any as ExpectationFailFn,
+	);
+	test.websql.fail(
+		urlCount,
+		testFunc(websqlAgg, 'COUNT(*) AS "$count"') as any as ExpectationFailFn,
+	);
 })();
 
 (function () {
@@ -49,7 +75,7 @@ FROM "pilot"`,
 		aliasPilotCanFlyPlaneFields,
 		(field) => field === '"pilot.pilot-can fly-plane"."can fly-plane"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
 			sqlEquals?.(
 				result,
@@ -79,8 +105,8 @@ FROM "pilot"`,
 		'/pilot?$expand=can_fly__plane($expand=plane)',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.fail(url, testFunc(mysqlAgg));
-		test.websql.fail(url, testFunc(websqlAgg));
+		test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+		test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 	}
 })();
 
@@ -93,7 +119,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -130,13 +156,13 @@ FROM "pilot"`,
 		'/pilot?$expand=can_fly__plane($expand=plane),licence',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.fail(url, testFunc(mysqlAgg));
-		test.websql.fail(url, testFunc(websqlAgg));
+		test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+		test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 	}
 })();
 
 (function () {
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -155,8 +181,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$select=licence&$expand=licence';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();
 
 (function () {
@@ -164,7 +190,7 @@ FROM "pilot"`,
 		aliasPilotCanFlyPlaneFields,
 		(field) => field === '"pilot.pilot-can fly-plane"."can fly-plane"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
 			sqlEquals?.(
 				result,
@@ -194,8 +220,8 @@ FROM "pilot"`,
 		'/pilot?$select=id&$expand=can_fly__plane($expand=plane)',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.fail(url, testFunc(mysqlAgg));
-		test.websql.fail(url, testFunc(websqlAgg));
+		test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+		test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 	}
 })();
 
@@ -204,7 +230,7 @@ FROM "pilot"`,
 		aliasPilotCanFlyPlaneFields,
 		(field) => field === '"pilot.pilot-can fly-plane"."can fly-plane"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -241,13 +267,13 @@ FROM "pilot"`,
 		'/pilot?$select=id,licence&$expand=can_fly__plane($expand=plane),licence',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.fail(url, testFunc(mysqlAgg));
-		test.websql.fail(url, testFunc(websqlAgg));
+		test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+		test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 	}
 })();
 
 (function () {
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
 			sqlEquals?.(
 				result,
@@ -266,8 +292,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=can_fly__plane($select=id)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();
 
 (function () {
@@ -275,7 +301,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc, fields) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc, fields) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -311,25 +337,31 @@ FROM "pilot"`,
 		url,
 		'GET',
 		[['Bind', 0]],
-		testFunc(mysqlAgg, aliasLicenceFields.join(', ')),
+		testFunc(
+			mysqlAgg,
+			aliasLicenceFields.join(', '),
+		) as any as ExpectationFailFn,
 	);
 	test.mysql.fail(
 		urlCount,
 		'GET',
 		[['Bind', 0]],
-		testFunc(mysqlAgg, 'COUNT(*) AS "$count"'),
+		testFunc(mysqlAgg, 'COUNT(*) AS "$count"') as any as ExpectationFailFn,
 	);
 	test.websql.fail(
 		url,
 		'GET',
 		[['Bind', 0]],
-		testFunc(websqlAgg, aliasLicenceFields.join(', ')),
+		testFunc(
+			websqlAgg,
+			aliasLicenceFields.join(', '),
+		) as any as ExpectationFailFn,
 	);
 	test.websql.fail(
 		urlCount,
 		'GET',
 		[['Bind', 0]],
-		testFunc(websqlAgg, 'COUNT(*) AS "$count'),
+		testFunc(websqlAgg, 'COUNT(*) AS "$count') as any as ExpectationFailFn,
 	);
 })();
 
@@ -338,7 +370,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -359,8 +391,18 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($filter=is_of__pilot/id eq 1)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.fail(
+		url,
+		'GET',
+		[['Bind', 0]],
+		testFunc(mysqlAgg) as any as ExpectationFailFn,
+	);
+	test.websql.fail(
+		url,
+		'GET',
+		[['Bind', 0]],
+		testFunc(websqlAgg) as any as ExpectationFailFn,
+	);
 })();
 
 (function () {
@@ -368,7 +410,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -388,8 +430,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($orderby=id)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();
 
 (function () {
@@ -397,7 +439,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore orderby', () => {
 			sqlEquals?.(
 				result,
@@ -416,8 +458,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($orderby=id)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg));
-	test.websql.fail(urlCount, testFunc(websqlAgg));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(urlCount, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();
 
 (function () {
@@ -425,7 +467,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -445,8 +487,18 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($top=10)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.fail(
+		url,
+		'GET',
+		[['Bind', 0]],
+		testFunc(mysqlAgg) as any as ExpectationFailFn,
+	);
+	test.websql.fail(
+		url,
+		'GET',
+		[['Bind', 0]],
+		testFunc(websqlAgg) as any as ExpectationFailFn,
+	);
 })();
 
 (function () {
@@ -454,7 +506,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore top', () => {
 			sqlEquals?.(
 				result,
@@ -473,8 +525,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($top=10)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg));
-	test.websql.fail(urlCount, testFunc(websqlAgg));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(urlCount, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();
 
 (function () {
@@ -482,7 +534,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
 			sqlEquals?.(
 				result,
@@ -502,8 +554,18 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($skip=10)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.fail(
+		url,
+		'GET',
+		[['Bind', 0]],
+		testFunc(mysqlAgg) as any as ExpectationFailFn,
+	);
+	test.websql.fail(
+		url,
+		'GET',
+		[['Bind', 0]],
+		testFunc(websqlAgg) as any as ExpectationFailFn,
+	);
 })();
 
 (function () {
@@ -511,7 +573,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore skip', () => {
 			sqlEquals?.(
 				result,
@@ -530,12 +592,12 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($skip=10)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg));
-	test.websql.fail(urlCount, testFunc(websqlAgg));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(urlCount, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();
 
 (function () {
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
 			sqlEquals?.(
 				result,
@@ -554,12 +616,12 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=can_fly__plane($select=plane)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();
 
 (function () {
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) pilot-can fly-plane and ignore select', () => {
 			sqlEquals?.(
 				result,
@@ -578,8 +640,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=can_fly__plane/$count($select=plane)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg));
-	test.websql.fail(urlCount, testFunc(websqlAgg));
+	test.mysql.fail(urlCount, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(urlCount, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();
 
 (function () {
@@ -588,7 +650,7 @@ FROM "pilot"`,
 		pilotFields,
 		(field) => field === '"pilot"."trained-pilot"',
 	).join(', ');
-	const testFunc = (aggFunc) => (result, sqlEquals) => {
+	const testFunc: TestFn = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated pilot', () => {
 			sqlEquals?.(
 				result,
@@ -607,6 +669,6 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=trained__pilot';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.fail(url, testFunc(mysqlAgg) as any as ExpectationFailFn);
+	test.websql.fail(url, testFunc(websqlAgg) as any as ExpectationFailFn);
 })();

package/test/odata/{filterby.js → filterby.ts}

@@ -4,29 +4,46 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 import { expect } from 'chai';
+import type { ExpectationSuccessFn } from './test';
 import test, { clientModel } from './test';
 import _ from 'lodash';
 import { odataNameToSqlName } from '@balena/odata-to-abstract-sql';
 import { pilotFields, teamFields, aliasPilotCanFlyPlaneFields } from './fields';
+import type {
+	Binding,
+	DurationNode,
+	SqlResult,
+} from '../../src/AbstractSQLCompiler';
 
 const pilotFieldsStr = pilotFields.join(', ');
 const aliasPilotCanFlyPlaneFieldsStr = aliasPilotCanFlyPlaneFields.join(', ');
 const teamFieldsStr = teamFields.join(', ');
 
-let parseOperandFactory = function (defaultResource) {
-	if (defaultResource == null) {
-		defaultResource = 'pilot';
-	}
+type ParsedOperand = {
+	odata: string | number | boolean;
+	bindings: Binding[];
+	sql: string;
+};
+type Operand =
+	| string
+	| number
+	| boolean
+	| Date
+	| DurationNode[1]
+	| ParsedOperand;
+
+let parseOperandFactory = function (defaultResource = 'pilot') {
 	let bindNo = 0;
-	const operandToOData = function (operand) {
-		if (operand.odata != null) {
-			return operand.odata;
-		}
-		if (_.isDate(operand)) {
-			return "datetime'" + encodeURIComponent(operand.toISOString()) + "'";
-		}
+	const operandToOData = function (operand: Operand) {
 		if (operand != null && typeof operand === 'object') {
-			const duration = [];
+			if ('odata' in operand) {
+				return operand.odata;
+			}
+			if (_.isDate(operand)) {
+				return "datetime'" + encodeURIComponent(operand.toISOString()) + "'";
+			}
+
+			const duration: Array<string | number> = [];
 			let t = false;
 			if (operand.negative) {
 				duration.push('-');
@@ -61,8 +78,8 @@ let parseOperandFactory = function (defaultResource) {
 		return operand;
 	};
 
-	const operandToBindings = function (operand) {
-		if (operand.bindings != null) {
+	const operandToBindings = function (operand: Operand): Binding[] {
+		if (typeof operand === 'object' && 'bindings' in operand) {
 			return operand.bindings;
 		}
 		if (
@@ -76,11 +93,11 @@ let parseOperandFactory = function (defaultResource) {
 		return [];
 	};
 
-	const operandToSQL = function (operand, resource) {
-		if (resource == null) {
-			resource = defaultResource;
-		}
-		if (operand.sql != null) {
+	const operandToSQL = function (
+		operand: Operand,
+		resource = defaultResource,
+	): string {
+		if (typeof operand === 'object' && 'sql' in operand) {
 			return operand.sql;
 		}
 		if (
@@ -134,17 +151,17 @@ let parseOperandFactory = function (defaultResource) {
 		throw new Error('Unknown operand type: ' + operand);
 	};
 
-	return (operand) => ({
+	return (operand: Operand): ParsedOperand => ({
 		sql: operandToSQL(operand),
 		bindings: operandToBindings(operand),
 		odata: operandToOData(operand),
 	});
 };
 
-let parseOperand = null;
+let parseOperand: ReturnType<typeof parseOperandFactory> | null = null;
 const run = (function () {
 	let running = false;
-	return function (fn) {
+	return function (fn: () => void) {
 		if (!running) {
 			running = true;
 			parseOperand = parseOperandFactory();
@@ -178,10 +195,10 @@ const methodMaps = {
 	TOLOWER: 'LOWER',
 };
 
-const createExpression = function (lhs, op, rhs) {
+const createExpression = function (lhs: Operand, op?: Operand, rhs?: Operand) {
 	let sql;
 	if (lhs === 'not') {
-		op = parseOperand(op);
+		op = parseOperand!(op!);
 		return {
 			odata: 'not(' + op.odata + ')',
 			sql: 'NOT (\n\t' + op.sql + '\n)',
@@ -189,17 +206,17 @@ const createExpression = function (lhs, op, rhs) {
 		};
 	}
 	if (rhs == null) {
-		lhs = parseOperand(lhs);
+		lhs = parseOperand!(lhs);
 		return {
 			odata: '(' + lhs.odata + ')',
 			sql: lhs.sql,
 			bindings: lhs.bindings,
 		};
 	}
-	lhs = parseOperand(lhs);
-	rhs = parseOperand(rhs);
+	lhs = parseOperand!(lhs);
+	rhs = parseOperand!(rhs);
 	const bindings = lhs.bindings.concat(rhs.bindings);
-	if (['eq', 'ne'].includes(op)) {
+	if (op === 'eq' || op === 'ne') {
 		if ([lhs.sql, rhs.sql].includes('NULL')) {
 			const nullCheck = op === 'eq' ? ' IS NULL' : ' IS NOT NULL';
 			if (lhs.sql === 'NULL') {
@@ -232,10 +249,10 @@ const createExpression = function (lhs, op, rhs) {
 			}
 		}
 	} else {
-		sql = `${lhs.sql}${sqlOps[op]} ${rhs.sql}`;
+		sql = `${lhs.sql}${sqlOps[op as keyof typeof sqlOps]} ${rhs.sql}`;
 	}
 
-	if (sqlOpBrackets[op]) {
+	if (sqlOpBrackets[op as keyof typeof sqlOpBrackets]) {
 		sql = '(' + sql + ')';
 	}
 	return {
@@ -244,43 +261,44 @@ const createExpression = function (lhs, op, rhs) {
 		bindings,
 	};
 };
-const createMethodCall = function (method, ...args) {
-	args = args.map((arg) => parseOperand(arg));
-	const odata = method + '(' + args.map((arg) => arg.odata).join(',') + ')';
+const createMethodCall = function (method: string, ...args: Operand[]) {
+	const parsedArgs = args.map((arg) => parseOperand!(arg));
+	const odata =
+		method + '(' + parsedArgs.map((arg) => arg.odata).join(',') + ')';
 	method = method.toUpperCase();
 	switch (method) {
 		case 'CONTAINS':
 		case 'SUBSTRINGOF':
 			if (method === 'SUBSTRINGOF') {
-				args.reverse();
+				parsedArgs.reverse();
 			}
 			return {
-				sql: `${args[0].sql} LIKE ('%' || REPLACE(REPLACE(REPLACE(${args[1].sql}, '\\', '\\\\'), '_', '\\_'), '%', '\\%') || '%')`,
-				bindings: [...args[0].bindings, ...args[1].bindings],
+				sql: `${parsedArgs[0].sql} LIKE ('%' || REPLACE(REPLACE(REPLACE(${parsedArgs[1].sql}, '\\', '\\\\'), '_', '\\_'), '%', '\\%') || '%')`,
+				bindings: [...parsedArgs[0].bindings, ...parsedArgs[1].bindings],
 				odata,
 			};
 		case 'STARTSWITH':
 			return {
-				sql: `STARTS_WITH(${args[0].sql}, ${args[1].sql})`,
-				bindings: [...args[0].bindings, ...args[1].bindings],
+				sql: `STARTS_WITH(${parsedArgs[0].sql}, ${parsedArgs[1].sql})`,
+				bindings: [...parsedArgs[0].bindings, ...parsedArgs[1].bindings],
 				odata,
 			};
 		case 'ENDSWITH':
 			return {
-				sql: `${args[0].sql} LIKE ('%' || REPLACE(REPLACE(REPLACE(${args[1].sql}, '\\', '\\\\'), '_', '\\_'), '%', '\\%'))`,
-				bindings: [...args[0].bindings, ...args[1].bindings],
+				sql: `${parsedArgs[0].sql} LIKE ('%' || REPLACE(REPLACE(REPLACE(${parsedArgs[1].sql}, '\\', '\\\\'), '_', '\\_'), '%', '\\%'))`,
+				bindings: [...parsedArgs[0].bindings, ...parsedArgs[1].bindings],
 				odata,
 			};
 		case 'CONCAT':
 			return {
-				sql: '(' + args.map((arg) => arg.sql).join(' || ') + ')',
-				bindings: _.flatten(args.map((arg) => arg.bindings)),
+				sql: '(' + parsedArgs.map((arg) => arg.sql).join(' || ') + ')',
+				bindings: _.flatten(parsedArgs.map((arg) => arg.bindings)),
 				odata,
 			};
 		case 'INDEXOF':
 			return {
-				sql: 'STRPOS(' + args.map((arg) => arg.sql).join(', ') + ') - 1',
-				bindings: _.flatten(args.map((arg) => arg.bindings)),
+				sql: 'STRPOS(' + parsedArgs.map((arg) => arg.sql).join(', ') + ') - 1',
+				bindings: _.flatten(parsedArgs.map((arg) => arg.bindings)),
 				odata,
 			};
 		case 'NOW':
@@ -295,60 +313,66 @@ const createMethodCall = function (method, ...args) {
 		case 'HOUR':
 		case 'MINUTE':
 			return {
-				sql: `EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${args[0].sql}))`,
-				bindings: args[0].bindings,
+				sql: `EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}))`,
+				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		case 'SECOND':
 			return {
-				sql: `FLOOR(EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${args[0].sql})))`,
-				bindings: args[0].bindings,
+				sql: `FLOOR(EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql})))`,
+				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		case 'FRACTIONALSECONDS':
 			return {
-				sql: `EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${args[0].sql})) - FLOOR(EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${args[0].sql})))`,
-				bindings: args[0].bindings,
+				sql: `EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql})) - FLOOR(EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql})))`,
+				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		case 'TIME':
 			return {
-				sql: `CAST(DATE_TRUNC('milliseconds', ${args[0].sql}) AS ${method})`,
-				bindings: args[0].bindings,
+				sql: `CAST(DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}) AS ${method})`,
+				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		case 'TOTALSECONDS':
 			return {
-				sql: `EXTRACT(EPOCH FROM ${args[0].sql})`,
-				bindings: args[0].bindings,
+				sql: `EXTRACT(EPOCH FROM ${parsedArgs[0].sql})`,
+				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		case 'DATE':
 			return {
-				sql: `DATE(DATE_TRUNC('milliseconds', ${args[0].sql}))`,
-				bindings: args[0].bindings,
+				sql: `DATE(DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}))`,
+				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		default: {
 			if (Object.prototype.hasOwnProperty.call(methodMaps, method)) {
-				method = methodMaps[method];
+				method = methodMaps[method as keyof typeof methodMaps];
 			}
 			switch (method) {
 				case 'SUBSTRING':
-					args[1].sql += ' + 1';
+					parsedArgs[1].sql += ' + 1';
 					break;
 			}
-			const sql = method + '(' + args.map((arg) => arg.sql).join(', ') + ')';
+			const sql =
+				method + '(' + parsedArgs.map((arg) => arg.sql).join(', ') + ')';
 			return {
 				sql,
-				bindings: _.flatten(args.map((arg) => arg.bindings)),
+				bindings: _.flatten(parsedArgs.map((arg) => arg.bindings)),
 				odata,
 			};
 		}
 	}
 };
 
-const operandTest = (lhs, op, rhs, override) => {
+const operandTest = (
+	lhs: Operand,
+	op?: Operand,
+	rhs?: Operand,
+	override?: Partial<ParsedOperand>,
+) => {
 	run(function () {
 		let from;
 		let { odata, sql, bindings } = createExpression(lhs, op, rhs);
@@ -392,7 +416,7 @@ WHERE ${sql}`,
 	});
 };
 
-const methodTest = (...args) => {
+const methodTest = (...args: [method: string, ...Operand[]]) => {
 	run(function () {
 		const { odata, sql, bindings } = createMethodCall(...args);
 		test(`/pilot?$filter=${odata}`, 'GET', bindings, (result, sqlEquals) => {
@@ -566,7 +590,7 @@ WHERE ${sql}`,
 });
 
 run(function () {
-	const { odata: keyOdata, bindings: keyBindings } = parseOperand(1);
+	const { odata: keyOdata, bindings: keyBindings } = parseOperand!(1);
 	const { odata, bindings } = createExpression('can_fly__plane/id', 'eq', 10);
 	test(
 		'/pilot(' + keyOdata + ')/can_fly__plane?$filter=' + odata,
@@ -600,8 +624,8 @@ run(function () {
 		10,
 	);
 	const name = 'Peter';
-	const bodyBindings = [['Bind', ['pilot', 'name']], ...bindings];
-	const insertTest = (result, sqlEquals) => {
+	const bodyBindings = [['Bind', ['pilot', 'name']], ...bindings] as const;
+	const insertTest: ExpectationSuccessFn = (result, sqlEquals) => {
 		sqlEquals(
 			result,
 			`\
@@ -685,11 +709,11 @@ ${updateWhere}`,
 					expect(result).to.be.an('array');
 				});
 				it('that inserts', () => {
-					insertTest(result[0], sqlEquals);
+					insertTest((result as SqlResult[])[0], sqlEquals);
 				});
 				it('and updates', () => {
 					sqlEquals(
-						result[1].query,
+						(result as SqlResult[])[1],
 						`\
 UPDATE "pilot"
 SET "created at" = DEFAULT,
@@ -736,11 +760,10 @@ run(function () {
 		sql,
 		bindings: exprBindings,
 	} = createExpression('name', 'eq', `'${name}'`);
-	const bindings = [['Bind', ['pilot', 'name']], ...exprBindings];
 	test(
 		`/pilot?$filter=${odata}`,
 		'POST',
-		bindings,
+		[['Bind', ['pilot', 'name']], ...exprBindings],
 		{ name },
 		(result, sqlEquals) => {
 			it(`should insert into pilot where '${odata}'`, () => {
@@ -767,20 +790,24 @@ WHERE EXISTS (
 
 run(function () {
 	const name = 'Peter';
-	const { odata: keyOdata, bindings: keyBindings } = parseOperand(1);
+	const { odata: keyOdata, bindings: keyBindings } = parseOperand!(1);
 	const {
 		odata,
 		sql,
 		bindings: exprBindings,
 	} = createExpression('name', 'eq', `'${name}'`);
-	const bodyBindings = [['Bind', ['pilot', 'name']]];
+	const bodyBindings = [['Bind', ['pilot', 'name']]] as const;
 	const insertBindings = [
 		['Bind', ['pilot', 'id']],
 		...bodyBindings,
 		...exprBindings,
 		...keyBindings,
-	];
-	const updateBindings = [...bodyBindings, ...keyBindings, ...exprBindings];
+	] as const;
+	const updateBindings = [
+		...bodyBindings,
+		...keyBindings,
+		...exprBindings,
+	] as const;
 	test(
 		'/pilot(' + keyOdata + ')?$filter=' + odata,
 		'PATCH',
@@ -816,7 +843,7 @@ AND "pilot"."id" IN ((
 				});
 				it('that inserts', () => {
 					sqlEquals(
-						result[0].query,
+						(result as SqlResult[])[0],
 						`\
 INSERT INTO "pilot" ("id", "name")
 SELECT "$insert"."id", "$insert"."name"
@@ -835,7 +862,7 @@ WHERE EXISTS (
 				});
 				it('and updates', () => {
 					sqlEquals(
-						result[1].query,
+						(result as SqlResult[])[1],
 						`\
 UPDATE "pilot"
 SET "created at" = DEFAULT,
@@ -864,7 +891,7 @@ AND "pilot"."id" IN ((
 });
 
 run(function () {
-	const { odata: keyOdata, bindings: keyBindings } = parseOperand(1);
+	const { odata: keyOdata, bindings: keyBindings } = parseOperand!(1);
 	const { odata, bindings, sql } = createExpression(
 		createExpression(1, 'eq', 1),
 		'or',
@@ -1442,14 +1469,13 @@ WHERE CURRENT_TIMESTAMP - DATE_TRUNC('milliseconds', "pilot"."created at") < INT
 
 run(function () {
 	const odata = 'now() add now()';
-	test.fail(`/pilot?$filter=${odata}`, 'GET', [], (result, sqlEquals) => {
+	test.fail(`/pilot?$filter=${odata}`, 'GET', [], (err) => {
 		it(
 			'should fail to add current_timestamp to current_timestamp where "' +
 				odata +
 				'"',
 			() => {
-				expect(result).to.be.empty;
-				expect(sqlEquals).to.be.undefined;
+				expect(err).to.be.instanceOf(Error);
 			},
 		);
 	});

package/test/odata/{resource_parsing.js → resource_parsing.ts}

@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import type { ExpectationSuccessFn } from './test';
 import test from './test';
 import * as ODataParser from '@balena/odata-parser';
 import {
@@ -9,6 +10,7 @@ import {
 	aliasPilotLicenceFields,
 	aliasLicenceFields,
 } from './fields';
+import type { SqlResult } from '../../src/AbstractSQLRules2SQL';
 const aliasPilotFields = aliasFields(
 	'plane.pilot-can fly-plane.pilot',
 	pilotFields,
@@ -151,7 +153,7 @@ test(
 	(result, sqlEquals) => {
 		it('should insert/update the pilot with id 1', () => {
 			sqlEquals(
-				result[0].query,
+				(result as SqlResult[])[0],
 				`\
 INSERT INTO "pilot" ("id")
 SELECT "$insert"."id"
@@ -167,7 +169,7 @@ WHERE EXISTS (
 )`,
 			);
 			sqlEquals(
-				result[1].query,
+				(result as SqlResult[])[1],
 				`\
 UPDATE "pilot"
 SET "created at" = DEFAULT,
@@ -214,12 +216,11 @@ INSERT INTO "pilot" DEFAULT VALUES`,
 });
 
 (function () {
-	// prettier-ignore
-	const bindings = /** @type {const} */ ([
+	const bindings = [
 		['Bind', ['pilot', 'is_experienced']],
 		['Bind', 0],
-	]);
-	const testFunc = (result, sqlEquals) => {
+	] as const;
+	const testFunc: ExpectationSuccessFn = (result, sqlEquals) => {
 		it('should update the pilot with id 1', () => {
 			sqlEquals(
 				result,
@@ -266,7 +267,7 @@ test(
 	(result, sqlEquals) => {
 		it('should insert/update the pilot-can fly-plane with id 1', () => {
 			sqlEquals(
-				result[0].query,
+				(result as SqlResult[])[0],
 				`\
 INSERT INTO "pilot-can fly-plane" ("id")
 SELECT "$insert"."id"
@@ -282,7 +283,7 @@ WHERE EXISTS (
 )`,
 			);
 			sqlEquals(
-				result[1].query,
+				(result as SqlResult[])[1],
 				`\
 UPDATE "pilot-can fly-plane"
 SET "created at" = DEFAULT,
@@ -325,12 +326,11 @@ INSERT INTO "pilot-can fly-plane" DEFAULT VALUES`,
 });
 
 (function () {
-	// prettier-ignore
-	const bindings = /** @type {const} */ ([
+	const bindings = [
 		['Bind', ['pilot-can fly-plane', 'pilot']],
 		['Bind', 0],
-	]);
-	const testFunc = (result, sqlEquals) => {
+	] as const;
+	const testFunc: ExpectationSuccessFn = (result, sqlEquals) => {
 		it('should update the pilot with id 1', () => {
 			sqlEquals(
 				result,

package/test/odata/{stress.js → stress.ts}

@@ -14,8 +14,7 @@ const filterBindsNandString = _.map(
 	() => 'NOT(("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?))',
 ).join('\nAND ');
 
-// prettier-ignore
-const filterBinds = filterIDs.map((_n, i) => /** @type {const} */ (['Bind', i]));
+const filterBinds = filterIDs.map((_n, i) => ['Bind', i] as const);
 
 let filterString = `id in (${filterIDs.join(', ')})`;
 test(

package/test/odata/test.ts

@@ -79,17 +79,18 @@ const sqlEquals = {
 	},
 } satisfies Record<string, SqlEquals>;
 
+type ReadonlyBinding = Readonly<AbstractSQLCompiler.Binding>;
 type ExpectedBindings = ReadonlyArray<
-	Readonly<AbstractSQLCompiler.Binding | AbstractSQLCompiler.Binding[]>
+	ReadonlyBinding | readonly ReadonlyBinding[]
 >;
 
-type ExpectationSuccessFn = (
+export type ExpectationSuccessFn = (
 	result:
 		| AbstractSQLCompiler.SqlResult
 		| [AbstractSQLCompiler.SqlResult, AbstractSQLCompiler.SqlResult],
 	sqlEquals: SqlEquals,
 ) => void;
-type ExpectationFailFn = (result: Error) => void;
+export type ExpectationFailFn = (result: Error) => void;
 type ExpectationFn<ExpectFail extends boolean> = ExpectFail extends true
 	? ExpectationFailFn
 	: ExpectationSuccessFn;

package/test/sbvr/{pilots.js → pilots.ts}

@@ -1,11 +1,12 @@
 import * as fs from 'node:fs';
 const typeVocab = fs.readFileSync(
 	require.resolve('@balena/sbvr-types/Type.sbvr'),
+	'utf8',
 );
 import { getTestHelpers } from './test';
 const test = getTestHelpers(typeVocab);
 
-const modifiedAtTrigger = (tableName) => `\
+const modifiedAtTrigger = (tableName: string) => `\
 DO
 $$
 BEGIN

package/test/sbvr/{reference-type.js → reference-type.ts}

@@ -3,9 +3,10 @@ import { getTestHelpers } from './test';
 
 const typeVocab = fs.readFileSync(
 	require.resolve('@balena/sbvr-types/Type.sbvr'),
+	'utf8',
 );
 
-const modifiedAtTrigger = (tableName) => `\
+const modifiedAtTrigger = (tableName: string) => `\
 DO
 $$
 BEGIN
@@ -24,7 +25,7 @@ END;
 $$`;
 
 describe('reference type', function () {
-	let test;
+	let test: ReturnType<typeof getTestHelpers>;
 	beforeEach(() => {
 		test = getTestHelpers(typeVocab);
 	});
@@ -37,7 +38,7 @@ Term:      term
 Term:      term history
 Fact Type: term history references term
 	Necessity: each term history references exactly one term
-	Reference Type: informative		
+	Reference Type: informative
 `,
 			[
 				`\
@@ -81,7 +82,7 @@ CREATE TABLE IF NOT EXISTS "term history" (
 Term:      term
 Term:      term history
 Fact Type: term history references term
-	Reference Type: informative		
+	Reference Type: informative
 	Necessity: each term history references exactly one term
 `,
 			[

package/test/sbvr/{test.js → test.ts}

@@ -4,10 +4,7 @@ import sbvrTypes from '@balena/sbvr-types';
 import { expect } from 'chai';
 import * as AbstractSQLCompiler from '../..';
 
-export function getTestHelpers(builtInVocab) {
-	if (builtInVocab == null) {
-		builtInVocab = false;
-	}
+export function getTestHelpers(builtInVocab: string | boolean = false) {
 	// eslint-disable-next-line @typescript-eslint/no-var-requires
 	const SBVRParser = require('@balena/sbvr-parser').SBVRParser.createInstance();
 	SBVRParser.enableReusingMemoizations(SBVRParser._sideEffectingRules);
@@ -22,7 +19,11 @@ export function getTestHelpers(builtInVocab) {
 
 	let seSoFar = '';
 
-	const runExpectation = (it, input, expectation) => {
+	const runExpectation = (
+		it: Mocha.TestFunction,
+		input: string,
+		expectation: (result: AbstractSQLCompiler.SqlModel | Error) => void,
+	) => {
 		it(input, function () {
 			let result;
 			try {
@@ -30,7 +31,7 @@ export function getTestHelpers(builtInVocab) {
 				const lf = SBVRParser.matchAll(seSoFar + input, 'Process');
 				const schema = LF2AbstractSQLTranslator(lf, 'Process');
 				result = AbstractSQLCompiler.postgres.compileSchema(schema);
-			} catch (e) {
+			} catch (e: any) {
 				expectation(e);
 				return;
 			}
@@ -38,7 +39,13 @@ export function getTestHelpers(builtInVocab) {
 		});
 	};
 
-	const runSchema = (it, input, expectation) => {
+	const runSchema = (
+		it: Mocha.TestFunction,
+		input: string,
+		expectation:
+			| ((result: AbstractSQLCompiler.SqlModel | Error) => void)
+			| string[],
+	) => {
 		runExpectation(it, input, function (result) {
 			seSoFar += input + '\n';
 			if (_.isFunction(expectation)) {
@@ -57,7 +64,13 @@ export function getTestHelpers(builtInVocab) {
 		});
 	};
 
-	const runRule = (it, input, expectation) => {
+	const runRule = (
+		it: Mocha.TestFunction,
+		input: string,
+		expectation:
+			| ((result: AbstractSQLCompiler.SqlModel | Error) => void)
+			| string,
+	) => {
 		runExpectation(it, 'Rule: ' + input, function (result) {
 			if (_.isFunction(expectation)) {
 				expectation(result);

package/tsconfig.json

@@ -14,8 +14,7 @@
 		"skipLibCheck": true,
 		"exactOptionalPropertyTypes": true,
 		"target": "es2023",
-		"outDir": "out",
-		"allowJs": true
+		"outDir": "out"
 	},
 	"include": [
 		"src/**/*",

package/.eslintrc.js

@@ -1,12 +0,0 @@
-module.exports = {
-	extends: ['./node_modules/@balena/lint/config/.eslintrc.js'],
-	parserOptions: {
-		project: 'tsconfig.js.json',
-		sourceType: 'module',
-	},
-	env: {
-		// TODO: Drop this once we convert all .js tests to .ts
-		mocha: true,
-	},
-	root: true,
-};

package/tsconfig.js.json

@@ -1,12 +0,0 @@
-{
-	"extends": "./tsconfig.json",
-	"compilerOptions": {
-		"noImplicitAny": false,
-		"checkJs": true
-	},
-	"include": [
-		"src/**/*",
-		"test/**/*",
-		".eslintrc.js"
-	],
-}