@balena/pinejs 17.0.0-build-v17-a23172f0d3c5aa4169ebb0f29d4939508c9074cf-2 → 17.0.0-build-17-x-74b0e8403edbd7922c684e3ce19bdb42ac41846b-1

package/out/webresource-handler/index.d.ts

@@ -2,7 +2,7 @@
 import type * as Express from 'express';
 import type * as stream from 'node:stream';
 import type { WebResourceType as WebResource } from '@balena/sbvr-types';
-import type { AnyObject } from 'pinejs-client-core';
+import { TypedError } from 'typed-error';
 export * from './handlers';
 export interface IncomingFile {
     fieldname: string;
@@ -15,34 +15,16 @@ export interface UploadResponse {
     size: number;
     filename: string;
 }
-export interface BeginMultipartUploadPayload {
-    filename: string;
-    content_type: string;
-    size: number;
-    chunk_size: number;
-}
-export interface UploadPart {
-    url: string;
-    chunkSize: number;
-    partNumber: number;
-}
-export interface BeginMultipartUploadHandlerResponse {
-    uploadParts: UploadPart[];
-    fileKey: string;
-    uploadId: string;
-}
-export interface CommitMultipartUploadPayload {
-    fileKey: string;
-    uploadId: string;
-    filename: string;
-    providerCommitData?: AnyObject;
-}
 export interface WebResourceHandler {
     handleFile: (resource: IncomingFile) => Promise<UploadResponse>;
     removeFile: (fileReference: string) => Promise<void>;
     onPreRespond: (webResource: WebResource) => Promise<WebResource>;
-    beginMultipartUpload: (fieldName: string, payload: BeginMultipartUploadPayload) => Promise<BeginMultipartUploadHandlerResponse>;
-    commitMultipartUpload: (commitInfo: CommitMultipartUploadPayload) => Promise<WebResource>;
+}
+export declare class WebResourceError extends TypedError {
+}
+export declare class FileSizeExceededError extends WebResourceError {
+    name: string;
+    constructor(maxSize: number);
 }
 export declare const setupWebresourceHandler: (handler: WebResourceHandler) => void;
 export declare const getWebresourceHandler: () => WebResourceHandler | undefined;

package/out/webresource-handler/index.js

@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupUploadHooks = exports.getDefaultHandler = exports.normalizeHref = exports.getUploaderMiddlware = exports.getWebresourceHandler = exports.setupWebresourceHandler = void 0;
+exports.setupUploadHooks = exports.getDefaultHandler = exports.normalizeHref = exports.getUploaderMiddlware = exports.getWebresourceHandler = exports.setupWebresourceHandler = exports.FileSizeExceededError = exports.WebResourceError = void 0;
 const busboy_1 = __importDefault(require("busboy"));
 const uriParser = __importStar(require("../sbvr-api/uri-parser"));
 const sbvrUtils = __importStar(require("../sbvr-api/sbvr-utils"));
@@ -38,10 +38,21 @@ const permissions_1 = require("../sbvr-api/permissions");
 const NoopHandler_1 = require("./handlers/NoopHandler");
 const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
 const module_1 = require("../server-glue/module");
+const typed_error_1 = require("typed-error");
 __exportStar(require("./handlers"), exports);
+class WebResourceError extends typed_error_1.TypedError {
+}
+exports.WebResourceError = WebResourceError;
+class FileSizeExceededError extends WebResourceError {
+    name = 'FileSizeExceededError';
+    constructor(maxSize) {
+        super(`File size exceeded the limit of ${maxSize} bytes.`);
+    }
+}
+exports.FileSizeExceededError = FileSizeExceededError;
 const getLogger = (vocab) => {
     if (vocab) {
-        return sbvrUtils.api[vocab]?.logger ?? console;
+        return sbvrUtils.logger[vocab] ?? console;
     }
     return console;
 };
@@ -150,8 +161,11 @@ const getUploaderMiddlware = (handler) => {
             }
             catch (err) {
                 await clearFiles();
-                getLogger((0, sbvr_utils_1.getApiRoot)(req)).warn('Error uploading file', err);
-                return sbvrUtils.handleHttpErrors(req, res, new module_1.errors.BadRequestError(err));
+                if (err instanceof FileSizeExceededError) {
+                    return sbvrUtils.handleHttpErrors(req, res, new module_1.errors.BadRequestError(err.message));
+                }
+                getLogger((0, sbvr_utils_1.getApiRoot)(req)).error('Error uploading file', err);
+                next(err);
             }
         });
         bb.on('error', async (err) => {

package/out/webresource-handler/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "17.0.0-build-v17-a23172f0d3c5aa4169ebb0f29d4939508c9074cf-2",
+  "version": "17.0.0-build-17-x-74b0e8403edbd7922c684e3ce19bdb42ac41846b-1",
   "main": "out/server-glue/module",
   "type": "commonjs",
   "repository": "git@github.com:balena-io/pinejs.git",
@@ -20,55 +20,53 @@
     "webpack-build": "npm run webpack-browser && npm run webpack-module && npm run webpack-server",
     "lint": "balena-lint -t tsconfig.dev.json -e js -e ts src build typings Gruntfile.ts && npx tsc --project tsconfig.dev.json --noEmit",
     "test": "npm run lint && npm run build && npm run webpack-build && npm run test:compose",
-    "test:compose": "trap 'docker compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' SIGINT; docker compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres PINEJS_WEBRESOURCE_MAXFILESIZE=1000000000 S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD S3_STORAGE_ADAPTER_BUCKET=balena-pine-web-resources S3_REGION=us-east-1 npm run mocha",
+    "test:compose": "trap 'docker compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' INT; docker compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres PINEJS_WEBRESOURCE_MAXFILESIZE=1000000000 S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD S3_STORAGE_ADAPTER_BUCKET=balena-pine-web-resources S3_REGION=us-east-1 npm run mocha",
     "mocha": "TS_NODE_FILES=true mocha",
     "prettify": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.ts"
   },
   "dependencies": {
-    "@balena/abstract-sql-compiler": "^9.1.0",
-    "@balena/abstract-sql-to-typescript": "^2.1.3",
-    "@balena/env-parsing": "^1.1.10",
-    "@balena/lf-to-abstract-sql": "^5.0.1",
-    "@balena/odata-parser": "^3.0.3",
-    "@balena/odata-to-abstract-sql": "^6.2.3",
-    "@balena/sbvr-parser": "^1.4.3",
-    "@balena/sbvr-types": "^7.0.1",
+    "@balena/abstract-sql-compiler": "^9.1.4",
+    "@balena/abstract-sql-to-typescript": "^3.0.2",
+    "@balena/env-parsing": "^1.1.12",
+    "@balena/lf-to-abstract-sql": "^5.0.2",
+    "@balena/odata-parser": "^3.0.7",
+    "@balena/odata-to-abstract-sql": "^6.2.7",
+    "@balena/sbvr-parser": "^1.4.4",
+    "@balena/sbvr-types": "^7.1.0",
     "@types/body-parser": "^1.19.5",
     "@types/compression": "^1.7.5",
-    "@types/cookie-parser": "^1.4.6",
+    "@types/cookie-parser": "^1.4.7",
     "@types/deep-freeze": "^0.1.5",
     "@types/express": "^4.17.21",
-    "@types/express-session": "^1.17.10",
-    "@types/lodash": "^4.14.202",
+    "@types/express-session": "^1.18.0",
+    "@types/lodash": "^4.17.1",
     "@types/memoizee": "^0.4.11",
     "@types/method-override": "^0.0.35",
     "@types/multer": "^1.4.11",
-    "@types/mysql": "^2.15.25",
-    "@types/node": "^20.11.2",
+    "@types/mysql": "^2.15.26",
+    "@types/node": "^20.12.10",
     "@types/passport": "^1.0.16",
     "@types/passport-local": "^1.0.38",
     "@types/passport-strategy": "^0.2.38",
-    "@types/pg": "^8.10.9",
-    "@types/randomstring": "^1.1.11",
+    "@types/pg": "^8.11.6",
+    "@types/randomstring": "^1.3.0",
     "@types/websql": "^0.0.30",
     "busboy": "^1.6.0",
     "commander": "^11.1.0",
     "deep-freeze": "^0.0.1",
     "eventemitter3": "^5.0.1",
-    "express-session": "^1.17.3",
+    "express-session": "^1.18.0",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
-    "pinejs-client-core": "^6.14.0",
+    "pinejs-client-core": "^6.14.4",
     "randomstring": "^1.3.0",
     "typed-error": "^3.2.2"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.556.0",
-    "@balena/lint": "^8.0.0",
-    "@balena/pinejs-webresource-s3": "^0.2.0",
-    "@faker-js/faker": "^8.3.1",
-    "@types/busboy": "^1.5.3",
-    "@types/chai": "^4.3.11",
+    "@balena/lint": "^8.0.2",
+    "@faker-js/faker": "^8.4.1",
+    "@types/busboy": "^1.5.4",
+    "@types/chai": "^4.3.16",
     "@types/chai-as-promised": "^7.1.8",
     "@types/grunt": "^0.4.31",
     "@types/mocha": "^10.0.6",
@@ -90,40 +88,43 @@
     "grunt-text-replace": "^0.4.0",
     "grunt-ts": "^6.0.0-beta.22",
     "grunt-webpack": "^6.0.0",
-    "husky": "^9.0.0",
-    "lint-staged": "^15.2.0",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2",
     "load-grunt-tasks": "^5.1.0",
-    "mocha": "^10.2.0",
+    "mocha": "^10.4.0",
     "on-finished": "^2.4.1",
-    "pinejs-client-supertest": "^2.0.2",
+    "pinejs-client-supertest": "^2.0.3",
     "raw-loader": "^4.0.2",
     "request": "^2.88.2",
     "require-npm4-to-publish": "^1.0.0",
-    "supertest": "^6.3.4",
+    "supertest": "^7.0.0",
     "terser-webpack-plugin": "^5.3.10",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3",
-    "webpack": "^5.89.0",
-    "webpack-dev-server": "^4.15.1"
+    "typescript": "^5.4.5",
+    "webpack": "^5.91.0",
+    "webpack-dev-server": "^4.15.2"
   },
   "optionalDependencies": {
+    "@aws-sdk/client-s3": "^3.569.0",
+    "@aws-sdk/lib-storage": "^3.569.0",
+    "@aws-sdk/s3-request-presigner": "^3.569.0",
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "method-override": "^3.0.0",
     "mysql": "^2.18.1",
     "passport": "^0.7.0",
     "passport-local": "^1.0.0",
-    "pg": "^8.11.3",
-    "pg-connection-string": "^2.6.2",
+    "pg": "^8.11.5",
+    "pg-connection-string": "^2.6.4",
     "serve-static": "^1.15.0"
   },
   "engines": {
-    "node": ">=18.18.0",
-    "npm": ">=8.0.0"
+    "node": ">=20.14.0",
+    "npm": ">=10.7.0"
   },
   "lint-staged": {
     "*.js": [
@@ -143,6 +144,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2024-04-19T19:12:20.783Z"
+    "publishedAt": "2024-06-04T15:19:23.285Z"
   }
 }

package/src/bin/abstract-sql-compiler.ts

@@ -17,7 +17,7 @@ const runCompile = async (inputFile: string, outputFile?: string) => {
 
 const generateTypes = async (inputFile: string, outputFile?: string) => {
 	const { abstractSqlToTypescriptTypes } = await import(
-		'@balena/abstract-sql-to-typescript'
+		'@balena/abstract-sql-to-typescript/generate'
 	);
 	const abstractSql = getAbstractSqlModelFromFile(inputFile);
 	const types = abstractSqlToTypescriptTypes(abstractSql);

package/src/bin/sbvr-compiler.ts

@@ -42,7 +42,7 @@ const generateTypes = async (inputFile: string, outputFile?: string) => {
 		program.opts().engine,
 	);
 	const { abstractSqlToTypescriptTypes } = await import(
-		'@balena/abstract-sql-to-typescript'
+		'@balena/abstract-sql-to-typescript/generate'
 	);
 	const types = abstractSqlToTypescriptTypes(models.abstractSql);
 

package/src/http-transactions/transactions.js

@@ -61,7 +61,7 @@ export function setup(app, sbvrUtils) {
 		sbvrUtils.addPureHook('PUT', modelName, 'all', {
 			async PRERUN({ tx, request }) {
 				const vocab = request.vocabulary;
-				const { logger } = sbvrUtils.api[vocab];
+				const log = sbvrUtils.logger[vocab];
 				const id = sbvrUtils.getID(vocab, request);
 				let result;
 				try {
@@ -77,7 +77,7 @@ SELECT NOT EXISTS(
 						[request.resourceName, id],
 					);
 				} catch (/** @type any */ err) {
-					logger.error('Unable to check resource locks', err);
+					log.error('Unable to check resource locks', err);
 					throw new Error('Unable to check resource locks');
 				}
 				if ([false, 0, '0'].includes(result.rows[0].result)) {

package/src/migrator/async.ts

@@ -28,7 +28,7 @@ import {
 import { booleanToEnabledString } from '../config-loader/env';
 
 // log the startup condition of the async migration
-(sbvrUtils.api?.migrations?.logger.info ?? console.info)(
+(sbvrUtils.logger?.migrations?.info ?? console.info)(
 	`Async migration execution is ${booleanToEnabledString(
 		migratorEnv.asyncMigrationIsEnabled,
 	)}`,
@@ -153,7 +153,7 @@ const $run = async (
 					(await tx.executeSql(asyncMigrationSqlStatement)).rowsAffected;
 			} else {
 				// don't break the async migration b/c of one migration fails
-				(sbvrUtils.api.migrations?.logger.error ?? console.error)(
+				(sbvrUtils.logger.migrations?.error ?? console.error)(
 					`Invalid migration object: ${JSON.stringify(migration, null, 2)}`,
 				);
 				continue;
@@ -170,7 +170,7 @@ const $run = async (
 			asyncRunnerMigratorFn = async (tx: Tx) =>
 				(await tx.executeSql(migration)).rowsAffected;
 		} else {
-			(sbvrUtils.api.migrations?.logger.error ?? console.error)(
+			(sbvrUtils.logger.migrations?.error ?? console.error)(
 				`Invalid async migration object: ${JSON.stringify(migration, null, 2)}`,
 			);
 			continue;
@@ -210,7 +210,7 @@ const $run = async (
 									if (!migrationState) {
 										// migration status is unclear stop the migrator
 										// or migration should stop
-										(sbvrUtils.api.migrations?.logger.info ?? console.info)(
+										(sbvrUtils.logger.migrations?.info ?? console.info)(
 											`stopping async migration due to missing migration status: ${key}`,
 										);
 										return false;
@@ -246,7 +246,7 @@ const $run = async (
 														}
 													} catch (err) {
 														(
-															sbvrUtils.api.migrations?.logger.error ??
+															sbvrUtils.logger.migrations?.error ??
 															console.error
 														)(
 															`error rolling back pending async migration tx on mgmt tx end/rollback: ${key}: ${err}`,
@@ -280,14 +280,13 @@ const $run = async (
 													initMigrationState.errorThreshold ===
 												0
 											) {
-												(
-													sbvrUtils.api.migrations?.logger.error ??
-													console.error
-												)(`${key}: ${err.name} ${err.message}`);
+												(sbvrUtils.logger.migrations?.error ?? console.error)(
+													`${key}: ${err.name} ${err.message}`,
+												);
 												migrationState.is_backing_off = true;
 											}
 										} else {
-											(sbvrUtils.api.migrations?.logger.error ?? console.error)(
+											(sbvrUtils.logger.migrations?.error ?? console.error)(
 												`async migration error unknown: ${key}: ${err}`,
 											);
 										}
@@ -312,7 +311,7 @@ const $run = async (
 						setTimeout(asyncRunner, initMigrationState.delayMS);
 					}
 				} catch (err) {
-					(sbvrUtils.api.migrations?.logger.error ?? console.error)(
+					(sbvrUtils.logger.migrations?.error ?? console.error)(
 						`error running async migration: ${key}: ${err}`,
 					);
 					setTimeout(asyncRunner, initMigrationState.backoffDelayMS);

package/src/migrator/sync.ts

@@ -29,7 +29,7 @@ export const postRun = async (tx: Tx, model: ApiRootModel): Promise<void> => {
 	const modelName = model.apiRoot;
 	const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
 	if (modelIsNew) {
-		(sbvrUtils.api.migrations?.logger.info ?? console.info)(
+		(sbvrUtils.logger.migrations?.info ?? console.info)(
 			`First time executing '${modelName}', running init script`,
 		);
 
@@ -37,7 +37,7 @@ export const postRun = async (tx: Tx, model: ApiRootModel): Promise<void> => {
 			try {
 				await tx.executeSql(initSql);
 			} catch (err: any) {
-				(sbvrUtils.api.migrations?.logger.error ?? console.error)(
+				(sbvrUtils.logger.migrations?.error ?? console.error)(
 					`initSql execution error ${err} `,
 				);
 				throw new MigrationError(err);
@@ -69,7 +69,7 @@ const $run = async (
 	// to make changes that can't be automatically applied
 	const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
 	if (modelIsNew) {
-		(sbvrUtils.api.migrations?.logger.info ?? console.info)(
+		(sbvrUtils.logger.migrations?.info ?? console.info)(
 			`First time model '${modelName}' has executed, skipping migrations`,
 		);
 		return await setExecutedMigrations(tx, modelName, Object.keys(migrations));
@@ -94,7 +94,7 @@ const $run = async (
 				...newlyExecutedMigrations,
 			]);
 		} catch (err: any) {
-			(sbvrUtils.api.migrations?.logger.error ?? console.error)(
+			(sbvrUtils.logger.migrations?.error ?? console.error)(
 				`Failed to executed synchronous migrations from api root model ${err}`,
 			);
 			throw new MigrationError(err);
@@ -111,7 +111,7 @@ const executeMigrations = async (
 			await executeMigration(tx, migration);
 		}
 	} catch (err: any) {
-		(sbvrUtils.api.migrations?.logger.error ?? console.error)(
+		(sbvrUtils.logger.migrations?.error ?? console.error)(
 			'Error while executing migrations, rolled back',
 		);
 		throw new MigrationError(err);
@@ -123,7 +123,7 @@ const executeMigration = async (
 	tx: Tx,
 	[key, migration]: MigrationTuple,
 ): Promise<void> => {
-	(sbvrUtils.api.migrations?.logger.info ?? console.info)(
+	(sbvrUtils.logger.migrations?.info ?? console.info)(
 		`Running migration ${JSON.stringify(key)}`,
 	);
 

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

@@ -671,20 +671,20 @@ export const executeModels = async (
 					await validateModel(tx, apiRoot);
 				}
 
-				// TODO: Can we do this without the cast?
-				api[apiRoot] = new PinejsClient('/' + apiRoot + '/') as LoggingClient;
-				api[apiRoot].logger = { ...console };
+				api[apiRoot] = new PinejsClient('/' + apiRoot + '/');
+
+				logger[apiRoot] = { ...console };
 				if (model.logging != null) {
 					const defaultSetting = model.logging?.default ?? true;
-					const { logger } = api[apiRoot];
+					const log = logger[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;
 						}
 					}
 				}
@@ -856,7 +856,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;
@@ -867,7 +867,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}`);
 		}
 
@@ -881,7 +881,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}`);
 		}
 
@@ -992,16 +992,7 @@ export const runRule = (() => {
 	};
 })();
 
-export type Passthrough = AnyObject & {
-	req?: {
-		user?: User;
-	};
-	tx?: Db.Tx;
-};
-
-export class PinejsClient extends PinejsClientCore<PinejsClient> {
-	// @ts-expect-error This is actually assigned by `super` so it is always declared but that isn't detected here
-	public passthrough: Passthrough;
+export class PinejsClient extends PinejsClientCore {
 	public async _request({
 		method,
 		url,
@@ -1021,11 +1012,11 @@ export class PinejsClient extends PinejsClientCore<PinejsClient> {
 	}
 }
 
-export type LoggingClient = PinejsClient & {
-	logger: Console;
-};
 export const api: {
-	[vocab: string]: LoggingClient;
+	[vocab: string]: PinejsClient;
+} = {};
+export const logger: {
+	[vocab: string]: Console;
 } = {};
 
 // We default to guest only permissions if no req object is passed in
@@ -1224,7 +1215,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,
@@ -1535,10 +1526,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;
 
@@ -1566,7 +1557,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;
@@ -1580,7 +1571,7 @@ const runRequest = async (
 				err instanceof TypeError ||
 				err instanceof URIError
 			) {
-				logger.error(err);
+				log.error(err);
 				throw new InternalRequestError();
 			}
 			throw err;
@@ -1740,7 +1731,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
@@ -1848,7 +1839,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`,
 					);
 				}