@balena/abstract-sql-compiler 10.6.3-build-tests-update-66ee93652310d4add5b0c8c09843dc052d796f5e-1 → 11.0.0-build-11-x-9f16483079cd561a9fdaa741cd830c2c5eb2065a-1

package/test/odata/orderby.ts

@@ -1,5 +1,5 @@
-import test from './test';
-import { pilotFields } from './fields';
+import test from './test.js';
+import { pilotFields } from './fields.js';
 const pilotFieldsStr = pilotFields.join(', ');
 
 test('/pilot?$orderby=name', (result, sqlEquals) => {

package/test/odata/paging.ts

@@ -1,5 +1,5 @@
-import test from './test';
-import { pilotFields } from './fields';
+import test from './test.js';
+import { pilotFields } from './fields.js';
 const pilotFieldsStr = pilotFields.join(', ');
 
 test('/pilot?$top=5', 'GET', [['Bind', 0]], (result, sqlEquals) => {

package/test/odata/resource_parsing.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
-import type { ExpectationSuccessFn } from './test';
-import test from './test';
-import * as ODataParser from '@balena/odata-parser';
+import type { ExpectationSuccessFn } from './test.js';
+import test from './test.js';
+import ODataParser from '@balena/odata-parser';
 import {
 	pilotFields,
 	teamFields,
@@ -9,8 +9,8 @@ import {
 	aliasPlaneFields,
 	aliasPilotLicenceFields,
 	aliasLicenceFields,
-} from './fields';
-import type { SqlResult } from '../../src/AbstractSQLRules2SQL';
+} from './fields.js';
+import type { SqlResult } from '../../out/AbstractSQLCompiler.js';
 const aliasPilotFields = aliasFields(
 	'plane.pilot-can fly-plane.pilot',
 	pilotFields,

package/test/odata/select.ts

@@ -1,5 +1,5 @@
-import test from './test';
-import { pilotFields } from './fields';
+import test from './test.js';
+import { pilotFields } from './fields.js';
 const pilotFieldsStr = pilotFields.join(', ');
 
 test('/pilot?$select=name', (result, sqlEquals) => {

package/test/odata/stress.ts

@@ -1,6 +1,6 @@
-import test from './test';
+import test from './test.js';
 import _ from 'lodash';
-import { pilotFields } from './fields';
+import { pilotFields } from './fields.js';
 const pilotFieldsStr = pilotFields.join(', ');
 
 const filterIDs = _.range(1, 5000);

package/test/odata/test.ts

@@ -1,33 +1,37 @@
-import * as fs from 'node:fs';
-import * as ODataParser from '@balena/odata-parser';
+import fs from 'node:fs';
+import ODataParser from '@balena/odata-parser';
 import { OData2AbstractSQL } from '@balena/odata-to-abstract-sql';
-const sbvrModel = fs.readFileSync(require.resolve('../model.sbvr'), 'utf8');
+import $sbvrTypes from '@balena/sbvr-types';
+const { default: sbvrTypes } = $sbvrTypes;
+// @ts-expect-error @balena/sbvr-parser doesn't have types
+import { SBVRParser } from '@balena/sbvr-parser';
+// @ts-expect-error @balena/lf-to-abstract-sql doesn't have types
+import LF2AbstractSQL from '@balena/lf-to-abstract-sql';
 
-import * as AbstractSQLCompiler from '../..';
+const sbvrModel = await fs.promises.readFile(
+	new URL(import.meta.resolve('../model.sbvr')),
+	'utf8',
+);
+const typeVocab = await fs.promises.readFile(
+	new URL(import.meta.resolve('@balena/sbvr-types/Type.sbvr')),
+	'utf8',
+);
+
+import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
 
 import { expect } from 'chai';
 import _ from 'lodash';
 
 const generateClientModel = function (input: string) {
-	// eslint-disable-next-line @typescript-eslint/no-require-imports
-	const sbvrTypes = require('@balena/sbvr-types').default;
-	const typeVocab = fs.readFileSync(
-		require.resolve('@balena/sbvr-types/Type.sbvr'),
-		'utf8',
-	);
-
-	// eslint-disable-next-line @typescript-eslint/no-require-imports
-	const SBVRParser = require('@balena/sbvr-parser').SBVRParser.createInstance();
-	SBVRParser.enableReusingMemoizations(SBVRParser._sideEffectingRules);
-	SBVRParser.AddCustomAttribute('Database ID Field:');
-	SBVRParser.AddCustomAttribute('Database Table Name:');
-	SBVRParser.AddBuiltInVocab(typeVocab);
+	const sbvrParser = SBVRParser.createInstance();
+	sbvrParser.enableReusingMemoizations(sbvrParser._sideEffectingRules);
+	sbvrParser.AddCustomAttribute('Database ID Field:');
+	sbvrParser.AddCustomAttribute('Database Table Name:');
+	sbvrParser.AddBuiltInVocab(typeVocab);
 
-	// eslint-disable-next-line @typescript-eslint/no-require-imports
-	const LF2AbstractSQL = require('@balena/lf-to-abstract-sql');
 	const LF2AbstractSQLTranslator = LF2AbstractSQL.createTranslator(sbvrTypes);
 
-	const lf = SBVRParser.matchAll(input, 'Process');
+	const lf = sbvrParser.matchAll(input, 'Process');
 	const abstractSql = LF2AbstractSQLTranslator(lf, 'Process');
 	return abstractSql;
 };

package/test/sbvr/pilots.ts

@@ -1,9 +1,9 @@
-import * as fs from 'node:fs';
+import fs from 'node:fs';
 const typeVocab = fs.readFileSync(
-	require.resolve('@balena/sbvr-types/Type.sbvr'),
+	new URL(import.meta.resolve('@balena/sbvr-types/Type.sbvr')),
 	'utf8',
 );
-import { getTestHelpers } from './test';
+import { getTestHelpers } from './test.js';
 const test = getTestHelpers(typeVocab);
 
 const modifiedAtTrigger = (tableName: string) => `\

package/test/sbvr/reference-type.ts

@@ -1,8 +1,8 @@
-import * as fs from 'node:fs';
-import { getTestHelpers } from './test';
+import fs from 'node:fs';
+import { getTestHelpers } from './test.js';
 
 const typeVocab = fs.readFileSync(
-	require.resolve('@balena/sbvr-types/Type.sbvr'),
+	new URL(import.meta.resolve('@balena/sbvr-types/Type.sbvr')),
 	'utf8',
 );
 

package/test/sbvr/test.ts

@@ -1,20 +1,22 @@
 import _ from 'lodash';
-import sbvrTypes from '@balena/sbvr-types';
+import $sbvrTypes from '@balena/sbvr-types';
+const { default: sbvrTypes } = $sbvrTypes;
+// @ts-expect-error @balena/sbvr-parser doesn't have types
+import { SBVRParser } from '@balena/sbvr-parser';
+// @ts-expect-error @balena/lf-to-abstract-sql doesn't have types
+import LF2AbstractSQL from '@balena/lf-to-abstract-sql';
 
 import { expect } from 'chai';
-import * as AbstractSQLCompiler from '../..';
+import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
 
 export function getTestHelpers(builtInVocab: string | boolean = false) {
-	// eslint-disable-next-line @typescript-eslint/no-require-imports
-	const SBVRParser = require('@balena/sbvr-parser').SBVRParser.createInstance();
-	SBVRParser.enableReusingMemoizations(SBVRParser._sideEffectingRules);
+	const sbvrParser = SBVRParser.createInstance();
+	sbvrParser.enableReusingMemoizations(sbvrParser._sideEffectingRules);
 
-	// eslint-disable-next-line @typescript-eslint/no-require-imports
-	const LF2AbstractSQL = require('@balena/lf-to-abstract-sql');
 	const LF2AbstractSQLTranslator = LF2AbstractSQL.createTranslator(sbvrTypes);
 
 	if (builtInVocab) {
-		SBVRParser.AddBuiltInVocab(builtInVocab);
+		sbvrParser.AddBuiltInVocab(builtInVocab);
 	}
 
 	let seSoFar = '';
@@ -27,8 +29,8 @@ export function getTestHelpers(builtInVocab: string | boolean = false) {
 		it(input, function () {
 			let result;
 			try {
-				SBVRParser.reset();
-				const lf = SBVRParser.matchAll(seSoFar + input, 'Process');
+				sbvrParser.reset();
+				const lf = sbvrParser.matchAll(seSoFar + input, 'Process');
 				const schema = LF2AbstractSQLTranslator(lf, 'Process');
 				result = AbstractSQLCompiler.postgres.compileSchema(schema);
 			} catch (e: any) {