@balena/pinejs 19.7.1-build-renovate-postgres-17-x-c90cce5d38c07adff2542c378674dbc07f394cc7-1 → 19.7.1-build-esm-prep-c47a755613fec8293547c7cfb34cc9e707a7c703-1

package/out/server-glue/module.js

@@ -91,11 +91,11 @@ const init = async (app, config, databaseOptions = envDatabaseOptions) => {
         const promises = [];
         if (process.env.SBVR_SERVER_ENABLED) {
             const sbvrServer = await import('../data-server/sbvr-server.js');
-            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')));
+            promises.push(cfgLoader.loadConfig(transactions.config).then(() => {
+                transactions.addModelHooks('data');
+            }));
         }
         if (!process.env.CONFIG_LOADER_DISABLED) {
             promises.push(cfgLoader.loadApplicationConfig(config));

package/out/server-glue/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/server-glue/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/server-glue/module.ts"],"names":[],"mappings":"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"}

package/out/server-glue/sbvr-loader.d.ts

@@ -1 +1 @@
-export {};
+export declare function requireSBVR(filePath: string, require: NodeRequire): string;

package/out/server-glue/sbvr-loader.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireSBVR = requireSBVR;
 if (!process.browser) {
     if (typeof nodeRequire === 'undefined' || nodeRequire == null) {
         global.nodeRequire = require;
@@ -7,4 +8,7 @@ if (!process.browser) {
     const fs = require('fs');
     nodeRequire.extensions['.sbvr'] = (module, filename) => (module.exports = fs.readFileSync(filename, 'utf8'));
 }
+function requireSBVR(filePath, require) {
+    return require('fs').readFileSync(require.resolve(filePath), 'utf8');
+}
 //# sourceMappingURL=sbvr-loader.js.map

package/out/server-glue/sbvr-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"sbvr-loader.js","sourceRoot":"","sources":["../../src/server-glue/sbvr-loader.ts"],"names":[],"mappings":";;AAEA,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACtB,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QAW/D,MAAM,CAAC,WAAW,GAAG,OAAO,CAAC;IAC9B,CAAC;IAGD,MAAM,EAAE,GAAc,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,MAAkB,EAAE,QAAgB,EAAE,EAAE,CAC1E,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AACvD,CAAC"}
+{"version":3,"file":"sbvr-loader.js","sourceRoot":"","sources":["../../src/server-glue/sbvr-loader.ts"],"names":[],"mappings":";;AA6BA,kCAKC;AAhCD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACtB,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QAW/D,MAAM,CAAC,WAAW,GAAG,OAAO,CAAC;IAC9B,CAAC;IAGD,MAAM,EAAE,GAAc,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,MAAkB,EAAE,QAAgB,EAAE,EAAE,CAC1E,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AACvD,CAAC;AAQD,SAAgB,WAAW,CAAC,QAAgB,EAAE,OAAoB;IACjE,OAAQ,OAAO,CAAC,IAAI,CAAyB,CAAC,YAAY,CACzD,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EACzB,MAAM,CACN,CAAC;AACH,CAAC"}

package/out/tasks/index.js

@@ -42,7 +42,8 @@ const hooks_1 = require("../sbvr-api/hooks");
 const sbvrUtils = __importStar(require("../sbvr-api/sbvr-utils"));
 const common_1 = require("./common");
 const worker_1 = require("./worker");
-const modelText = require('./tasks.sbvr');
+const sbvr_loader_1 = require("../server-glue/sbvr-loader");
+const modelText = (0, sbvr_loader_1.requireSBVR)('./tasks.sbvr', require);
 const initSql = `
 CREATE INDEX IF NOT EXISTS idx_task_poll ON task USING btree (
 	"is executed by-handler",
@@ -56,7 +57,7 @@ exports.config = {
             modelName: common_1.apiRoot,
             apiRoot: common_1.apiRoot,
             modelText,
-            customServerCode: exports,
+            customServerCode: { setup },
             initSql,
         },
     ],

package/out/tasks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tasks/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tasks/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "19.7.1-build-renovate-postgres-17-x-c90cce5d38c07adff2542c378674dbc07f394cc7-1",
+  "version": "19.7.1-build-esm-prep-c47a755613fec8293547c7cfb34cc9e707a7c703-1",
   "main": "out/server-glue/module",
   "type": "commonjs",
   "repository": "git@github.com:balena-io/pinejs.git",
@@ -147,6 +147,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2024-12-18T11:55:55.700Z"
+    "publishedAt": "2024-12-30T13:46:30.474Z"
   }
 }

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

@@ -1,8 +1,9 @@
 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 { requireSBVR } from '../server-glue/sbvr-loader';
 import { version as sbvrParserVersion } from '@balena/sbvr-parser/package.json';
-import { version } from '@balena/sbvr-parser/package.json';
+import { version } from '../config-loader/env';
+
+const Types = requireSBVR('@balena/sbvr-types/Type.sbvr', require);
 
 export const ExtendedSBVRParser = SBVRParser._extend({
 	initialize() {

package/src/http-transactions/transactions.js

@@ -1,7 +1,6 @@
 import { odataNameToSqlName } from '@balena/odata-to-abstract-sql';
-// @ts-expect-error b/c TS doesn't know what the result of requiring an sbvr file would be
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const transactionModel = require('./transaction.sbvr');
+import { requireSBVR } from '../server-glue/sbvr-loader';
+const transactionModel = requireSBVR('./transaction.sbvr', require);
 
 /** @type {import('../config-loader/config-loader').Config} */
 export const config = {

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/migrator/sync.ts

@@ -15,9 +15,9 @@ import type { Config, Model } from '../config-loader/config-loader';
 
 import _ from 'lodash';
 import * as sbvrUtils from '../sbvr-api/sbvr-utils';
+import { requireSBVR } from '../server-glue/sbvr-loader';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const migrationsModel = require('./migrations.sbvr');
+const migrationsModel = requireSBVR('./migrations.sbvr', require);
 
 type ApiRootModel = Model & { apiRoot: string };
 

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,13 +51,13 @@ 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';
+import { requireSBVR } from '../server-glue/sbvr-loader';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const userModel: string = require('./user.sbvr');
+const userModel = requireSBVR('./user.sbvr', require);
 
 const DEFAULT_ACTOR_BIND = '@__ACTOR_ID';
 const DEFAULT_ACTOR_BIND_REGEX = new RegExp(
@@ -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

@@ -44,10 +44,10 @@ import { ExtendedSBVRParser } from '../extended-sbvr-parser/extended-sbvr-parser
 import * as asyncMigrator from '../migrator/async';
 import * as syncMigrator from '../migrator/sync';
 import { generateODataMetadata } from '../odata-metadata/odata-metadata-generator';
+import { requireSBVR } from '../server-glue/sbvr-loader';
 
 import type DevModel from './dev';
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const devModel = require('./dev.sbvr');
+const devModel = requireSBVR('./dev.sbvr', require);
 import * as permissions from './permissions';
 import {
 	BadRequestError,
@@ -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/server-glue/sbvr-loader.ts

@@ -20,3 +20,16 @@ if (!process.browser) {
 	nodeRequire.extensions['.sbvr'] = (module: NodeModule, filename: string) =>
 		(module.exports = fs.readFileSync(filename, 'utf8'));
 }
+
+/**
+ *
+ * @param filePath The module to load
+ * @param parentUrl Use `require`
+ * @returns The sbvr file contents
+ */
+export function requireSBVR(filePath: string, require: NodeRequire) {
+	return (require('fs') as typeof import('fs')).readFileSync(
+		require.resolve(filePath),
+		'utf8',
+	);
+}

package/src/tasks/index.ts

@@ -10,11 +10,11 @@ import { Worker } from './worker';
 import type TasksModel from './tasks';
 import type { Task } from './tasks';
 import type { FromSchema } from 'json-schema-to-ts';
+import { requireSBVR } from '../server-glue/sbvr-loader';
 
 export type * from './tasks';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const modelText: string = require('./tasks.sbvr');
+const modelText = requireSBVR('./tasks.sbvr', require);
 
 // Create index for polling tasks table
 const initSql = `
@@ -37,7 +37,7 @@ export const config: ConfigLoader.Config = {
 			modelName: apiRoot,
 			apiRoot,
 			modelText,
-			customServerCode: exports,
+			customServerCode: { setup },
 			initSql,
 		},
 	],