@balena/pinejs 19.7.0 → 19.7.1-build-esm-prep-83eacbb700f89dd2730c9a879b96a456503a1d2a-1

package/src/bin/utils.ts

@@ -10,9 +10,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import '../server-glue/sbvr-loader';
 
-export const { version } = JSON.parse(
-	fs.readFileSync(require.resolve('../../package.json'), 'utf8'),
-);
+export { version } from '../config-loader/env';
 
 export const writeAll = (output: string, outputFile?: string): void => {
 	if (outputFile) {

package/src/config-loader/env.ts

@@ -1,3 +1,8 @@
+import * as fs from 'fs';
+export const { version } = JSON.parse(
+	fs.readFileSync(require.resolve('../../package.json'), 'utf8'),
+);
+
 const { PINEJS_DEBUG } = process.env;
 if (![undefined, '', '0', '1'].includes(PINEJS_DEBUG)) {
 	throw new Error(`Invalid value for PINEJS_DEBUG '${PINEJS_DEBUG}'`);
@@ -51,7 +56,7 @@ export const cache = {
 
 import { boolVar, intVar } from '@balena/env-parsing';
 import memoize from 'memoizee';
-import memoizeWeak = require('memoizee/weak');
+import memoizeWeak from 'memoizee/weak';
 export const createCache = <T extends (...args: any[]) => any>(
 	cacheName: keyof typeof cache,
 	fn: T,

package/src/data-server/sbvr-server.ts

@@ -207,7 +207,7 @@ export const setup: SetupFunction = async (app, sbvrUtils, db) => {
 					console.warn(
 						'DEL /cleardb is very destructive and should really be followed by a full restart/reload.',
 					);
-					await sbvrUtils.executeModels(tx, exports.config.models);
+					await sbvrUtils.executeModels(tx, config.models);
 					await setupModels(tx);
 				});
 				res.status(200).end();
@@ -377,7 +377,7 @@ export const setup: SetupFunction = async (app, sbvrUtils, db) => {
 	await db.transaction(setupModels);
 };
 
-export const config: Config = {
+export const config = {
 	models: [
 		{
 			modelName: 'ui',
@@ -409,4 +409,4 @@ ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT N
 			},
 		},
 	],
-};
+} satisfies Config;

package/src/extended-sbvr-parser/extended-sbvr-parser.ts

@@ -2,7 +2,7 @@ import { SBVRParser } from '@balena/sbvr-parser';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Types: string = require('@balena/sbvr-types/Type.sbvr');
 import { version as sbvrParserVersion } from '@balena/sbvr-parser/package.json';
-import { version } from '@balena/sbvr-parser/package.json';
+import { version } from '../config-loader/env';
 
 export const ExtendedSBVRParser = SBVRParser._extend({
 	initialize() {

package/src/migrator/async.ts

@@ -27,13 +27,6 @@ import {
 } from './utils';
 import { booleanToEnabledString } from '../config-loader/env';
 
-// log the startup condition of the async migration
-(sbvrUtils.logger?.migrations?.info ?? console.info)(
-	`Async migration execution is ${booleanToEnabledString(
-		migratorEnv.asyncMigrationIsEnabled,
-	)}`,
-);
-
 export const run = async (tx: Tx, model: ApiRootModel): Promise<void> => {
 	const { migrations } = model;
 	if (migrations == null || _.isEmpty(migrations)) {
@@ -188,6 +181,13 @@ const $run = async (
 	// created. When the transaction fails, the setup async migration entries in the DB will be
 	// rolled back automatically.
 	setupTx.on('end', () => {
+		// log the startup condition of the async migration
+		(sbvrUtils.logger?.migrations?.info ?? console.info)(
+			`Async migration execution is ${booleanToEnabledString(
+				migratorEnv.asyncMigrationIsEnabled,
+			)}`,
+		);
+
 		for (const {
 			key,
 			initMigrationState,

package/src/odata-metadata/odata-metadata-generator.ts

@@ -4,9 +4,7 @@ import type {
 } from '@balena/abstract-sql-compiler';
 
 import sbvrTypes, { type SbvrType } from '@balena/sbvr-types';
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { version }: { version: string } = require('../../package.json');
+import { version } from '../config-loader/env';
 
 const getResourceName = (resourceName: string): string =>
 	resourceName

package/src/passport-pinejs/passport-pinejs.ts

@@ -33,16 +33,13 @@ export const checkPassword: PassportLocal.VerifyFunction = async (
 	}
 };
 
-const setup: ConfigLoader.SetupFunction = (app: Express.Application) => {
+const setup: ConfigLoader.SetupFunction = async (app: Express.Application) => {
 	if (!process.browser) {
-		// eslint-disable-next-line @typescript-eslint/no-var-requires
-		const passport: typeof Passport = require('passport');
+		const { default: passport } = await import('passport');
 		app.use(passport.initialize());
 		app.use(passport.session());
 
-		const {
-			Strategy: LocalStrategy, // eslint-disable-next-line @typescript-eslint/no-var-requires
-		}: typeof PassportLocal = require('passport-local');
+		const { Strategy: LocalStrategy } = await import('passport-local');
 
 		passport.serializeUser((user, done) => {
 			done(null, user);

package/src/sbvr-api/permissions.ts

@@ -51,7 +51,7 @@ import {
 	metadataEndpoints,
 	type ODataRequest,
 } from './uri-parser';
-import memoizeWeak = require('memoizee/weak');
+import memoizeWeak from 'memoizee/weak';
 import type { Config } from '../config-loader/config-loader';
 import type { ODataOptions } from 'pinejs-client-core';
 import type { Permission } from './user';
@@ -1787,7 +1787,7 @@ declare module './sbvr-utils' {
 const authModelConfig = {
 	apiRoot: 'Auth',
 	modelText: userModel,
-	customServerCode: exports,
+	customServerCode: { setup },
 	migrations: {
 		'11.0.0-modified-at': `
 			ALTER TABLE "actor"
@@ -1826,7 +1826,7 @@ const authModelConfig = {
 export const config = {
 	models: [authModelConfig],
 } satisfies Config;
-export const setup = () => {
+export function setup() {
 	addHook('all', 'all', 'all', {
 		sideEffects: false,
 		readOnlyTx: true,
@@ -1924,4 +1924,4 @@ export const setup = () => {
 				id: request.values.actor,
 			}),
 	});
-};
+}

package/src/sbvr-api/sbvr-utils.ts

@@ -83,7 +83,7 @@ export {
 	addSideEffectHook,
 } from './hooks';
 
-import memoizeWeak = require('memoizee/weak');
+import memoizeWeak from 'memoizee/weak';
 import * as controlFlow from './control-flow';
 
 export let db = undefined as any as Db.Database;
@@ -2069,7 +2069,7 @@ export const setup = async (
 	_app: Express.Application,
 	$db: Db.Database,
 ): Promise<void> => {
-	exports.db = db = $db;
+	db = $db;
 	try {
 		await db.transaction(async (tx) => {
 			await executeStandardModels(tx);
@@ -2092,7 +2092,7 @@ export const postSetup = async (
 	_app: Express.Application,
 	$db: Db.Database,
 ): Promise<void> => {
-	exports.db = db = $db;
+	db = $db;
 	try {
 		await db.transaction(async (tx) => {
 			await postExecuteModels(tx);

package/src/sbvr-api/uri-parser.ts

@@ -13,7 +13,7 @@ import * as ODataParser from '@balena/odata-parser';
 export const SyntaxError = ODataParser.SyntaxError;
 import { OData2AbstractSQL } from '@balena/odata-to-abstract-sql';
 import _ from 'lodash';
-import memoizeWeak = require('memoizee/weak');
+import memoizeWeak from 'memoizee/weak';
 
 export { BadRequestError, ParsingError, TranslationError } from './errors';
 import deepFreeze from 'deep-freeze';

package/src/server-glue/module.ts

@@ -70,13 +70,12 @@ export const init = async <T extends string>(
 		const promises: Array<Promise<void>> = [];
 		if (process.env.SBVR_SERVER_ENABLED) {
 			const sbvrServer = await import('../data-server/sbvr-server.js');
-			// eslint-disable-next-line @typescript-eslint/no-var-requires
-			const transactions = require('../http-transactions/transactions');
+			const transactions = await import('../http-transactions/transactions.js');
 			promises.push(cfgLoader.loadConfig(sbvrServer.config));
 			promises.push(
-				cfgLoader
-					.loadConfig(transactions.config)
-					.then(() => transactions.addModelHooks('data')),
+				cfgLoader.loadConfig(transactions.config).then(() => {
+					transactions.addModelHooks('data');
+				}),
 			);
 		}
 		if (!process.env.CONFIG_LOADER_DISABLED) {

package/src/tasks/index.ts

@@ -37,7 +37,7 @@ export const config: ConfigLoader.Config = {
 			modelName: apiRoot,
 			apiRoot,
 			modelText,
-			customServerCode: exports,
+			customServerCode: { setup },
 			initSql,
 		},
 	],