@balena/pinejs 16.2.0-build-joshbwlng-tasks-7478568100de4cf0789edd97865827cae9041667-1 → 16.2.0-build-joshbwlng-tasks-8552b344881d795e9ce7a999cec89f98f20902b7-2

package/src/sbvr-api/abstract-sql.ts

@@ -49,7 +49,7 @@ export const compileRequest = (request: ODataRequest) => {
 			request.sqlQuery = sqlQuery;
 			request.modifiedFields = modifiedFields;
 		} catch (err: any) {
-			sbvrUtils.api[request.vocabulary].logger.error(
+			sbvrUtils.logger[request.vocabulary].error(
 				'Failed to compile abstract sql: ',
 				request.abstractSqlQuery,
 				err,

package/src/sbvr-api/permissions.ts

@@ -1268,7 +1268,7 @@ export const getUserPermissions = async (
 	try {
 		return await $getUserPermissions(userId, tx);
 	} catch (err: any) {
-		sbvrUtils.api.Auth.logger.error('Error loading user permissions', err);
+		sbvrUtils.logger.Auth.error('Error loading user permissions', err);
 		throw err;
 	}
 };
@@ -1396,7 +1396,7 @@ export const getApiKeyPermissions = async (
 	try {
 		return await $getApiKeyPermissions(apiKey, tx);
 	} catch (err: any) {
-		sbvrUtils.api.Auth.logger.error('Error loading api key permissions', err);
+		sbvrUtils.logger.Auth.error('Error loading api key permissions', err);
 		throw err;
 	}
 };
@@ -1577,7 +1577,7 @@ export const checkPermissionsMiddleware =
 					);
 			}
 		} catch (err: any) {
-			sbvrUtils.api.Auth.logger.error('Error checking permissions', err);
+			sbvrUtils.logger.Auth.error('Error checking permissions', err);
 			res.status(503).end();
 		}
 	};

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

@@ -678,18 +678,19 @@ export const executeModels = async (
 				api[apiRoot].logger = { ...console };
 				if (model.logging != null) {
 					const defaultSetting = model.logging?.default ?? true;
-					const { logger } = api[apiRoot];
+					const { logger: log } = api[apiRoot];
 					for (const k of Object.keys(model.logging)) {
 						const key = k as keyof Console;
 						if (
 							key !== 'Console' &&
-							typeof logger[key] === 'function' &&
+							typeof log[key] === 'function' &&
 							!(model.logging?.[key] ?? defaultSetting)
 						) {
-							logger[key] = _.noop;
+							log[key] = _.noop;
 						}
 					}
 				}
+				logger[apiRoot] = api[apiRoot].logger;
 				return compiledModel;
 				// Only update the dev models once all models have finished executing.
 			}),
@@ -858,7 +859,7 @@ export const runRule = (() => {
 	translator.addTypes(sbvrTypes);
 	return async (vocab: string, rule: string) => {
 		const seModel = models[vocab].se;
-		const { logger } = api[vocab];
+		const log = logger[vocab];
 		let lfModel: LFModel;
 		let slfModel: LFModel;
 		let abstractSqlModel: AbstractSQLCompiler.AbstractSqlModel;
@@ -869,7 +870,7 @@ export const runRule = (() => {
 				'Process',
 			);
 		} catch (e) {
-			logger.error('Error parsing rule', rule, e);
+			log.error('Error parsing rule', rule, e);
 			throw new Error(`Error parsing rule'${rule}': ${e}`);
 		}
 
@@ -883,7 +884,7 @@ export const runRule = (() => {
 			translator.reset();
 			abstractSqlModel = translator.match(slfModel, 'Process');
 		} catch (e) {
-			logger.error('Error compiling rule', rule, e);
+			log.error('Error compiling rule', rule, e);
 			throw new Error(`Error compiling rule '${rule}': ${e}`);
 		}
 
@@ -1023,12 +1024,18 @@ export class PinejsClient extends PinejsClientCore {
 	}
 }
 
+/**
+ * @deprecated Use `logger[vocab]` instead of `api[vocab].logger`
+ */
 export type LoggingClient = PinejsClient & {
 	logger: Console;
 };
 export const api: {
 	[vocab: string]: LoggingClient;
 } = {};
+export const logger: {
+	[vocab: string]: Console;
+} = {};
 
 // We default to guest only permissions if no req object is passed in
 export const runURI = async (
@@ -1226,7 +1233,7 @@ export const getModel = (vocabulary: string) => {
 
 const runODataRequest = (req: Express.Request, vocabulary: string) => {
 	if (env.DEBUG) {
-		api[vocabulary].logger.log('Parsing', req.method, req.url);
+		logger[vocabulary].log('Parsing', req.method, req.url);
 	}
 
 	// Get the hooks for the current method/vocabulary as we know it,
@@ -1537,10 +1544,10 @@ const runRequest = async (
 	tx: Db.Tx,
 	request: uriParser.ODataRequest,
 ): Promise<Response> => {
-	const { logger } = api[request.vocabulary];
+	const log = logger[request.vocabulary];
 
 	if (env.DEBUG) {
-		logger.log('Running', req.method, req.url);
+		log.log('Running', req.method, req.url);
 	}
 	let result: Db.Result | number | undefined;
 
@@ -1568,7 +1575,7 @@ const runRequest = async (
 		} catch (err: any) {
 			if (err instanceof db.DatabaseError) {
 				prettifyConstraintError(err, request);
-				logger.error(err);
+				log.error(err);
 				// Override the error message so we don't leak any internal db info
 				err.message = 'Database error';
 				throw err;
@@ -1582,7 +1589,7 @@ const runRequest = async (
 				err instanceof TypeError ||
 				err instanceof URIError
 			) {
-				logger.error(err);
+				log.error(err);
 				throw new InternalRequestError();
 			}
 			throw err;
@@ -1742,7 +1749,7 @@ const runQuery = async (
 	);
 
 	if (env.DEBUG) {
-		api[vocabulary].logger.log(query, values);
+		logger[vocabulary].log(query, values);
 	}
 
 	// We only add the returning clause if it's been requested and `affectedIds` hasn't been populated yet
@@ -1850,7 +1857,7 @@ const respondPost = async (
 		id,
 	);
 	if (env.DEBUG) {
-		api[vocab].logger.log('Insert ID: ', request.resourceName, id);
+		logger[vocab].log('Insert ID: ', request.resourceName, id);
 	}
 
 	let result: AnyObject = { d: [{ id }] };

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

@@ -421,7 +421,7 @@ export const translateUri = <
 		request.values = new Proxy(request.values, {
 			set: (obj: ODataRequest['values'], prop: string, value) => {
 				if (!Object.prototype.hasOwnProperty.call(obj, prop)) {
-					sbvrUtils.api[request.vocabulary].logger.warn(
+					sbvrUtils.logger[request.vocabulary].warn(
 						`Assigning a new request.values property '${prop}' however it will be ignored`,
 					);
 				}

package/src/webresource-handler/index.ts

@@ -51,7 +51,7 @@ type WebResourcesDbResponse = {
 
 const getLogger = (vocab?: string): Console => {
 	if (vocab) {
-		return sbvrUtils.api[vocab]?.logger ?? console;
+		return sbvrUtils.logger[vocab] ?? console;
 	}
 	return console;
 };