@balena/pinejs 15.3.6-build-fixes-expand-on-parent-resource-34e60c2a2921e971b04422e7901f4dbc4df2dde7-1 → 15.3.6-build-balena-lint-v7-e12b277bc505d89507b61730b026cea7a7e71bc5-1

package/src/config-loader/config-loader.ts

@@ -32,7 +32,6 @@ import {
 	getUploaderMiddlware,
 	WebResourceHandler,
 	setupUploadHooks,
-	setupWebresourceHandler,
 } from '../webresource-handler';
 import { AliasValidNodeType } from '../sbvr-api/translations';
 
@@ -206,7 +205,6 @@ export const setup = (app: Express.Application) => {
 						const webResourceHandler =
 							data.webResourceHandler ?? getDefaultHandler();
 
-						setupWebresourceHandler(webResourceHandler);
 						const fileUploadMiddleware =
 							getUploaderMiddlware(webResourceHandler);
 						app
@@ -379,7 +377,7 @@ export const setup = (app: Express.Application) => {
 								switch (fileExtension) {
 									case '.coffee':
 									case '.ts':
-									case '.js':
+									case '.js': {
 										const loadeMigration = nodeRequire(filePath);
 										const migration = loadeMigration.default ?? loadeMigration;
 
@@ -394,6 +392,7 @@ export const setup = (app: Express.Application) => {
 
 										assignMigrationWithCategory(migrationKey, migration);
 										break;
+									}
 									case '.sql':
 										if (migrationCategory === MigrationCategories.async) {
 											console.error(

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

@@ -48,7 +48,7 @@ const serverIsOnAir = async (_req, _res, next) => {
 };
 
 /** @type {import('../config-loader/config-loader').Config} */
-export let config = {
+export const config = {
 	models: [
 		{
 			modelName: 'ui',
@@ -267,6 +267,8 @@ export async function setup(app, sbvrUtils, db) {
 							try {
 								await tx.executeSql(query);
 							} catch (err) {
+								// TODO: Consider changing this to a custom Error
+								// eslint-disable-next-line no-throw-literal
 								throw [query, err];
 							}
 						}

package/src/database-layer/db.ts

@@ -168,7 +168,7 @@ const atomicExecuteSql: Database['executeSql'] = async function (
 };
 
 const asyncTryFn = (fn: () => any) => {
-	Promise.resolve().then(fn);
+	void Promise.resolve().then(fn);
 };
 
 type RejectedFunctions = (message: string) => {
@@ -215,7 +215,10 @@ class AutomaticClose {
 	private automaticCloseTimeout: ReturnType<typeof setTimeout>;
 	private automaticClose: () => void;
 	private pending: false | number = 0;
-	constructor(tx: Tx, private stackTraceErr?: Error) {
+	constructor(
+		tx: Tx,
+		private stackTraceErr?: Error,
+	) {
 		this.automaticClose = () => {
 			console.error(
 				`Transaction still open after ${env.db.timeoutMS}ms without an execute call.`,
@@ -223,7 +226,7 @@ class AutomaticClose {
 			if (this.stackTraceErr) {
 				console.error(this.stackTraceErr.stack);
 			}
-			tx.rollback();
+			void tx.rollback();
 		};
 		this.automaticCloseTimeout = setTimeout(
 			this.automaticClose,
@@ -400,10 +403,13 @@ export abstract class Tx {
 	protected abstract _rollback(): Promise<void>;
 	protected abstract _commit(): Promise<void>;
 
+	// TODO: Re-enable the lint rule once eslint properly supports abstract class base implementations
 	public async getTxLevelLock(
+		/* eslint-disable @typescript-eslint/no-unused-vars */
 		_namespaceKey: string,
 		_key: number,
 		_blocking: boolean = true,
+		/* eslint-enable @typescript-eslint/no-unused-vars */
 	): Promise<boolean> {
 		throw new Error(
 			'The getTxLevelLock method is not implemented for the current engine.',
@@ -462,7 +468,6 @@ const createTransaction = (createFunc: CreateTransactionFn): TransactionFn => {
 
 let maybePg: typeof Pg | undefined;
 try {
-	// tslint:disable-next-line:no-var-requires
 	maybePg = require('pg');
 } catch (e) {
 	// Ignore errors
@@ -497,7 +502,7 @@ if (maybePg != null) {
 			const p = new pg.Pool(config);
 			if (PG_SCHEMA != null) {
 				p.on('connect', (client) => {
-					client.query({ text: `SET search_path TO "${PG_SCHEMA}"` });
+					void client.query({ text: `SET search_path TO "${PG_SCHEMA}"` });
 				});
 			}
 			p.on('connect', (client) => {
@@ -519,6 +524,7 @@ if (maybePg != null) {
 		let pool: Pg.Pool;
 		let replica: Pg.Pool;
 		if (typeof connectString === 'string') {
+			// eslint-disable-next-line @typescript-eslint/no-var-requires
 			const pgConnectionString: typeof PgConnectionString = require('pg-connection-string');
 			// We have to cast because of the use of null vs undefined
 			const config = pgConnectionString.parse(connectString) as Pg.PoolConfig;
@@ -617,9 +623,9 @@ if (maybePg != null) {
 					);
 					this.db.release();
 				} catch (err: any) {
-					err = wrapDatabaseError(err);
-					this.db.release(err);
-					throw err;
+					const errorToReturn = wrapDatabaseError(err);
+					this.db.release(errorToReturn);
+					throw errorToReturn;
 				}
 			}
 
@@ -686,13 +692,13 @@ if (maybePg != null) {
 			transaction: createTransaction(async (stackTraceErr) => {
 				const client = await pool.connect();
 				const tx = new PostgresTx(client, false, stackTraceErr);
-				tx.executeSql('START TRANSACTION;');
+				void tx.executeSql('START TRANSACTION;');
 				return tx;
 			}),
 			readTransaction: createTransaction(async (stackTraceErr) => {
 				const client = await replica.connect();
 				const tx = new PostgresTx(client, false, stackTraceErr);
-				tx.executeSql('START TRANSACTION READ ONLY;');
+				void tx.executeSql('START TRANSACTION READ ONLY;');
 				return tx.asReadOnly();
 			}),
 			...alwaysExport,
@@ -702,7 +708,6 @@ if (maybePg != null) {
 
 let maybeMysql: typeof Mysql | undefined;
 try {
-	// tslint:disable-next-line:no-var-requires
 	maybeMysql = require('mysql');
 } catch (e) {
 	// Ignore errors
@@ -809,14 +814,14 @@ if (maybeMysql != null) {
 				const client = await getConnectionAsync();
 				const close = () => client.release();
 				const tx = new MySqlTx(client, close, false, stackTraceErr);
-				tx.executeSql('START TRANSACTION;');
+				void tx.executeSql('START TRANSACTION;');
 				return tx;
 			}),
 			readTransaction: createTransaction(async (stackTraceErr) => {
 				const client = await getConnectionAsync();
 				const close = () => client.release();
 				const tx = new MySqlTx(client, close, false, stackTraceErr);
-				tx.executeSql('START TRANSACTION READ ONLY;');
+				void tx.executeSql('START TRANSACTION READ ONLY;');
 				return tx.asReadOnly();
 			}),
 			...alwaysExport,
@@ -935,7 +940,6 @@ if (typeof window !== 'undefined' && window.openDatabase != null) {
 			// allowing us to use async calls within the API.
 			private asyncRecurse = () => {
 				let args: AsyncQuery | undefined;
-				// tslint:disable-next-line no-conditional-assignment
 				while ((args = this.queue.pop())) {
 					console.debug('Running', args[0]);
 					this.tx.executeSql(args[0], args[1], args[2], args[3]);

package/src/express-emulator/express.js

@@ -34,10 +34,10 @@ const app = (function () {
 		/** @type {string} */ match,
 		/** @type import('express').Handler[] */ ...middleware
 	) {
-		//Strip wildcard
+		// Strip wildcard
 		let paramName;
 		match = match.toLowerCase();
-		const newMatch = match.replace(/[\/\*]*$/, '');
+		const newMatch = match.replace(/[/*]*$/, '');
 		if (newMatch !== match) {
 			match = newMatch;
 			paramName = '*';
@@ -59,6 +59,8 @@ const app = (function () {
 		/** @type any */ body = '',
 	) {
 		if (!handlers[method]) {
+			// TODO: Consider changing this to a custom Error
+			// eslint-disable-next-line no-throw-literal
 			throw [404, null, null];
 		}
 		const req = {

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

@@ -1,5 +1,5 @@
 import { SBVRParser } from '@balena/sbvr-parser';
-// tslint:disable-next-line:no-var-requires
+// 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';

package/src/http-transactions/transactions.js

@@ -1,10 +1,10 @@
-import * as _ from 'lodash';
 import { odataNameToSqlName } from '@balena/odata-to-abstract-sql';
-// @ts-ignore
+// @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');
 
 /** @type {import('../config-loader/config-loader').Config} */
-export let config = {
+export const config = {
 	models: [
 		{
 			apiRoot: 'transaction',
@@ -130,7 +130,12 @@ WHERE "conditional field"."conditional resource" = ?;`,
 								modelField.dataType === 'ForeignKey' &&
 								Number.isNaN(Number(fieldValue))
 							) {
-								if (!placeholders.hasOwnProperty(fieldValue)) {
+								if (
+									!Object.prototype.hasOwnProperty.call(
+										placeholders,
+										fieldValue,
+									)
+								) {
 									throw new Error('Cannot resolve placeholder' + fieldValue);
 								} else {
 									try {
@@ -170,7 +175,7 @@ WHERE "conditional resource"."transaction" = ?;\
 							resolve = $resolve;
 							reject = $reject;
 						});
-						// @ts-ignore
+						// @ts-expect-error we use resolve & reject before they are assigned b/c we treat them as a deferred.
 						placeholders[placeholder] = { promise, resolve, reject };
 					}
 				}

package/src/migrator/sync.ts

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

package/src/migrator/utils.ts

@@ -32,12 +32,12 @@ export type AsyncMigrationFn = (
 	sbvrUtils: SbvrUtils,
 ) => Resolvable<number>;
 
-type AddFn<T extends {}, x extends 'sync' | 'async'> = T & {
+type AddFn<T extends object, x extends 'sync' | 'async'> = T & {
 	[key in `${x}Fn`]: key extends 'syncFn' ? MigrationFn : AsyncMigrationFn;
 } & {
 	[key in `${x}Sql`]?: undefined;
 };
-type AddSql<T extends {}, x extends 'sync' | 'async'> = T & {
+type AddSql<T extends object, x extends 'sync' | 'async'> = T & {
 	[key in `${x}Fn`]?: undefined;
 } & {
 	[key in `${x}Sql`]: string;

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

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

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

@@ -10,7 +10,7 @@ import * as permissions from '../sbvr-api/permissions';
 export let login: (
 	fn: (
 		err: any,
-		user: {} | null | false | undefined,
+		user: object | null | false | undefined,
 		req: Express.Request,
 		res: Express.Response,
 		next: Express.NextFunction,
@@ -35,12 +35,13 @@ export const checkPassword: PassportLocal.VerifyFunction = async (
 
 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');
 		app.use(passport.initialize());
 		app.use(passport.session());
 
 		const {
-			Strategy: LocalStrategy,
+			Strategy: LocalStrategy, // eslint-disable-next-line @typescript-eslint/no-var-requires
 		}: typeof PassportLocal = require('passport-local');
 
 		passport.serializeUser((user, done) => {
@@ -66,7 +67,11 @@ const setup: ConfigLoader.SetupFunction = async (app: Express.Application) => {
 
 		logout = (req, _res, next) => {
 			req.logout((error) => {
-				error ? next(error) : next();
+				if (error) {
+					next(error);
+					return;
+				}
+				next();
 			});
 		};
 	} else {

package/src/pinejs-session-store/pinejs-session-store.ts

@@ -50,7 +50,7 @@ const asCallback = async <T>(
 
 export class PinejsSessionStore extends Store {
 	public get = ((sid, callback) => {
-		asCallback(
+		void asCallback(
 			callback,
 			api.session
 				.get({
@@ -77,7 +77,7 @@ export class PinejsSessionStore extends Store {
 			data,
 			expiry_time: data?.cookie?.expires ?? null,
 		};
-		asCallback(
+		void asCallback(
 			callback,
 			api.session.put({
 				resource: 'session',
@@ -91,7 +91,7 @@ export class PinejsSessionStore extends Store {
 	}) as Store['set'];
 
 	public destroy = ((sid, callback) => {
-		asCallback(
+		void asCallback(
 			callback,
 			api.session.delete({
 				resource: 'session',
@@ -104,7 +104,7 @@ export class PinejsSessionStore extends Store {
 	}) as Store['destroy'];
 
 	public all = ((callback) => {
-		asCallback(
+		void asCallback(
 			callback,
 			api.session
 				.get({
@@ -124,7 +124,7 @@ export class PinejsSessionStore extends Store {
 	}) as Store['all'];
 
 	public clear = ((callback) => {
-		asCallback(
+		void asCallback(
 			callback,
 			// TODO: Use a truncate
 			api.session.delete({
@@ -137,7 +137,7 @@ export class PinejsSessionStore extends Store {
 	}) as Store['clear'];
 
 	public length = ((callback) => {
-		asCallback(
+		void asCallback(
 			callback,
 			api.session.get({
 				resource: 'session/',

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

@@ -116,7 +116,7 @@ export const getAndCheckBindValues = async (
 					[dataType, value] = odataBinds[bindValue];
 					field = { dataType };
 				} else if (typeof bindValue === 'string') {
-					if (!odataBinds.hasOwnProperty(bindValue)) {
+					if (!Object.prototype.hasOwnProperty.call(odataBinds, bindValue)) {
 						console.error(
 							`Invalid binding '${bindValue}' for binds: `,
 							odataBinds,

package/src/sbvr-api/cached-compile.ts

@@ -12,7 +12,6 @@ let cache: null | {
 } = null;
 let fs: undefined | typeof Fs;
 try {
-	// tslint:disable-next-line:no-var-requires
 	fs = require('fs');
 } catch (e) {
 	// Ignore error

package/src/sbvr-api/express-extension.ts

@@ -1,11 +1,13 @@
 // Augment express.js with pinejs-specific attributes via declaration merging.
 
-// tslint:disable-next-line:no-namespace
+// eslint-disable-next-line @typescript-eslint/no-namespace, @typescript-eslint/no-unused-vars
 declare namespace Express {
 	type PineUser = import('./sbvr-utils').User;
 
-	// tslint:disable-next-line:no-empty-interface
+	// Augment Express.User to include the props of our PineUser.
+	// eslint-disable-next-line @typescript-eslint/no-empty-interface
 	interface User extends PineUser {}
+
 	interface Request {
 		user?: User;
 		apiKey?: import('./sbvr-utils').ApiKey;

package/src/sbvr-api/hooks.ts

@@ -101,7 +101,7 @@ class SideEffectHook<T extends HookFn> extends Hook<T> {
 
 	public registerRollback(fn: RollbackAction): void {
 		if (this.rolledBack) {
-			(async () => {
+			void (async () => {
 				try {
 					await fn();
 				} catch {
@@ -140,7 +140,7 @@ export const rollbackRequestHooks = <T extends InstantiatedHooks>(
 	if (sideEffectHooks.length === 0) {
 		return;
 	}
-	settleMapSeries(sideEffectHooks, async (hook) => {
+	void settleMapSeries(sideEffectHooks, async (hook) => {
 		await hook.rollback();
 	});
 };
@@ -391,8 +391,7 @@ const getReadOnlyArgs = <T extends keyof Hooks>(
 		// If we don't have a tx then read-only/writable is irrelevant
 		return args;
 	}
-	let readOnlyArgs: typeof args;
-	readOnlyArgs = { ...args, tx: args.tx.asReadOnly() };
+	const readOnlyArgs: typeof args = { ...args, tx: args.tx.asReadOnly() };
 	if ((args as HookArgs).request != null) {
 		defineApi(modelName, readOnlyArgs as HookArgs);
 	}

package/src/sbvr-api/odata-response.ts

@@ -1,5 +1,11 @@
+import type {
+	AbstractSqlModel,
+	AbstractSqlTable,
+} from '@balena/abstract-sql-compiler';
+
+// Augment express.js with pinejs-specific attributes via declaration merging.
 declare module '@balena/abstract-sql-compiler' {
-	interface AbstractSqlTable {
+	export interface AbstractSqlTable {
 		fetchProcessingFields?: {
 			[field: string]: NonNullable<SbvrType['fetchProcessing']>;
 		};
@@ -9,20 +15,12 @@ declare module '@balena/abstract-sql-compiler' {
 	}
 }
 
-import type {
-	AbstractSqlModel,
-	AbstractSqlTable,
-} from '@balena/abstract-sql-compiler';
 import type { Result, Row } from '../database-layer/db';
 
 import { sqlNameToODataName } from '@balena/odata-to-abstract-sql';
 import sbvrTypes, { SbvrType } from '@balena/sbvr-types';
 import * as _ from 'lodash';
 import { resolveNavigationResource, resolveSynonym } from './sbvr-utils';
-import {
-	getWebresourceHandler,
-	isWebResourceField,
-} from '../webresource-handler';
 
 const checkForExpansion = async (
 	vocab: string,
@@ -148,28 +146,21 @@ export const process = async (
 
 	const fetchProcessingFields = getFetchProcessingFields(table);
 	const processedFields = fieldNames.filter((fieldName) =>
-		fetchProcessingFields.hasOwnProperty(fieldName),
+		Object.prototype.hasOwnProperty.call(fetchProcessingFields, fieldName),
 	);
 
 	const localFields = getLocalFields(table);
 	// We check that it's not a local field, rather than that it is a foreign key because of the case where the foreign key is on the other resource
 	// and hence not known to this resource
 	const expandableFields = fieldNames.filter(
-		(fieldName) => !localFields.hasOwnProperty(fieldName),
+		(fieldName) =>
+			!Object.prototype.hasOwnProperty.call(localFields, fieldName),
 	);
 
 	const odataIdField = sqlNameToODataName(table.idField);
-	const webResourceHandler = getWebresourceHandler();
 	for (const row of rows) {
 		for (const fieldName of processedFields) {
 			row[fieldName] = fetchProcessingFields[fieldName](row[fieldName]);
-			if (
-				webResourceHandler &&
-				isWebResourceField(fieldName, table) &&
-				row[fieldName]?.href != null
-			) {
-				row[fieldName] = await webResourceHandler.onPreRespond(row[fieldName]);
-			}
 		}
 		if (includeMetadata) {
 			row.__metadata = {

package/src/sbvr-api/permissions.ts

@@ -52,7 +52,7 @@ import {
 } from './uri-parser';
 import memoizeWeak = require('memoizee/weak');
 
-// tslint:disable-next-line:no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const userModel: string = require('./user.sbvr');
 
 const DEFAULT_ACTOR_BIND = '@__ACTOR_ID';
@@ -87,7 +87,7 @@ interface NestedCheckOr<T> {
 interface NestedCheckAnd<T> {
 	and: NestedCheckArray<T>;
 }
-interface NestedCheckArray<T> extends Array<NestedCheck<T>> {}
+type NestedCheckArray<T> = Array<NestedCheck<T>>;
 type NestedCheck<T> =
 	| NestedCheckOr<T>
 	| NestedCheckAnd<T>
@@ -175,22 +175,26 @@ const isAnd = <T>(x: any): x is NestedCheckAnd<T> =>
 	typeof x === 'object' && 'and' in x;
 const isOr = <T>(x: any): x is NestedCheckOr<T> =>
 	typeof x === 'object' && 'or' in x;
-export function nestedCheck<I extends {}, O>(
-	check: string,
+export function nestedCheck<I extends string, O>(
+	check: I,
 	stringCallback: (s: string) => O,
 ): O;
-export function nestedCheck<I extends {}, O>(
-	check: boolean,
+export function nestedCheck<I extends boolean, O>(
+	check: I,
 	stringCallback: (s: string) => O,
 ): boolean;
-export function nestedCheck<I extends {}, O>(
+export function nestedCheck<I extends NonNullable<unknown>, O>(
 	check: NestedCheck<I>,
 	stringCallback: (s: string) => O,
 ): Exclude<I, string> | O | MappedNestedCheck<typeof check, I, O>;
-export function nestedCheck<I extends {}, O>(
-	check: NestedCheck<I>,
+export function nestedCheck<I extends object, O>(
+	check: NestedCheck<I> | string | boolean,
 	stringCallback: (s: string) => O,
-): boolean | Exclude<I, string> | O | MappedNestedCheck<typeof check, I, O> {
+):
+	| boolean
+	| Exclude<I, string>
+	| O
+	| MappedNestedCheck<Exclude<typeof check, string | boolean>, I, O> {
 	if (typeof check === 'string') {
 		return stringCallback(check);
 	}
@@ -228,10 +232,11 @@ export function nestedCheck<I extends {}, O>(
 		}
 		const checkType = checkTypes[0];
 		switch (checkType.toUpperCase()) {
-			case 'AND':
+			case 'AND': {
 				const and = (check as NestedCheckAnd<I>)[checkType as 'and'];
 				return nestedCheck(and, stringCallback);
-			case 'OR':
+			}
+			case 'OR': {
 				const or = (check as NestedCheckOr<I>)[checkType as 'or'];
 				let results: any[] = [];
 				for (const subcheck of or) {
@@ -255,6 +260,7 @@ export function nestedCheck<I extends {}, O>(
 					};
 				}
 				return false;
+			}
 			default:
 				throw new Error('Cannot parse required checking logic: ' + checkType);
 		}
@@ -425,7 +431,7 @@ const convertToLambda = (filter: AnyObject, identifier: string) => {
 			}
 		}
 
-		if (object.hasOwnProperty('name')) {
+		if (Object.prototype.hasOwnProperty.call(object, 'name')) {
 			object.property = { ...object };
 			object.name = identifier;
 			delete object.lambda;
@@ -721,7 +727,7 @@ const deepFreezeExceptDefinition = (obj: AnyObject) => {
 		// We skip the definition because we know it's a property we've defined that will throw an error in some cases
 		if (
 			prop !== 'definition' &&
-			obj.hasOwnProperty(prop) &&
+			Object.prototype.hasOwnProperty.call(obj, prop) &&
 			obj[prop] !== null &&
 			!['object', 'function'].includes(typeof obj[prop])
 		) {

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

@@ -3,7 +3,9 @@ import type * as Db from '../database-layer/db';
 import type { Model } from '../config-loader/config-loader';
 import type { AnyObject, RequiredField } from './common-types';
 
+// Augment the Express typings
 declare global {
+	// eslint-disable-next-line @typescript-eslint/no-namespace
 	namespace Express {
 		export interface Request {
 			tx?: Db.Tx;
@@ -38,7 +40,7 @@ import * as asyncMigrator from '../migrator/async';
 import * as syncMigrator from '../migrator/sync';
 import { generateODataMetadata } from '../odata-metadata/odata-metadata-generator';
 
-// tslint:disable-next-line:no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const devModel = require('./dev.sbvr');
 import * as permissions from './permissions';
 import {
@@ -249,13 +251,14 @@ const prettifyConstraintError = (
 							err.message,
 						);
 					break;
-				case 'postgres':
+				case 'postgres': {
 					const resourceName = resolveSynonym(request);
 					const abstractSqlModel = getFinalAbstractSqlModel(request);
 					matches = new RegExp(
 						'"' + abstractSqlModel.tables[resourceName].name + '_(.*?)_key"',
 					).exec(err.message);
 					break;
+				}
 			}
 			// We know it's the right error type, so if matches exists just throw a generic error message, since we have failed to get the info for a more specific one.
 			if (matches == null) {
@@ -282,7 +285,7 @@ const prettifyConstraintError = (
 							err.message,
 						);
 					break;
-				case 'postgres':
+				case 'postgres': {
 					const resourceName = resolveSynonym(request);
 					const abstractSqlModel = getFinalAbstractSqlModel(request);
 					const tableName = abstractSqlModel.tables[resourceName].name;
@@ -301,6 +304,7 @@ const prettifyConstraintError = (
 						).exec(err.message);
 					}
 					break;
+				}
 			}
 			// We know it's the right error type, so if no matches exists just throw a generic error message,
 			// since we have failed to get the info for a more specific one.
@@ -983,7 +987,7 @@ export class PinejsClient extends PinejsClientCore<PinejsClient> {
 		req?: permissions.PermissionReq;
 		custom?: AnyObject;
 	}) {
-		return (await runURI(method, url, body, tx, req, custom)) as {};
+		return (await runURI(method, url, body, tx, req, custom)) as object;
 	}
 }
 

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

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

package/src/server-glue/global-ext.d.ts

@@ -1,5 +1,6 @@
+// We have to use var when extending the global namespace
+// eslint-disable-next-line no-var
 declare var nodeRequire: NodeRequire;
-/* tslint:disable-next-line:no-namespace */
 declare namespace NodeJS {
 	export interface Process {
 		browser: boolean;