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

package/src/server-glue/module.ts

@@ -66,6 +66,7 @@ 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');
+			// eslint-disable-next-line @typescript-eslint/no-var-requires
 			const transactions = require('../http-transactions/transactions');
 			promises.push(cfgLoader.loadConfig(sbvrServer.config));
 			promises.push(

package/src/server-glue/sbvr-loader.ts

@@ -15,7 +15,7 @@ if (!process.browser) {
 		global.nodeRequire = require;
 	}
 	// Register a .sbvr loader
-	// tslint:disable-next-line:no-var-requires
+	// eslint-disable-next-line @typescript-eslint/no-var-requires
 	const fs: typeof Fs = require('fs');
 	nodeRequire.extensions['.sbvr'] = (module: NodeModule, filename: string) =>
 		(module.exports = fs.readFileSync(filename, 'utf8'));

package/src/server-glue/server.ts

@@ -27,7 +27,7 @@ switch (app.get('env')) {
 }
 
 if (!process.browser) {
-	// tslint:disable:no-var-requires
+	/* eslint-disable @typescript-eslint/no-var-requires */
 	const passport: typeof Passport = require('passport');
 	const path: typeof Path = require('path');
 	const compression: typeof Compression = require('compression');
@@ -36,7 +36,7 @@ if (!process.browser) {
 	const bodyParser: typeof BodyParser = require('body-parser');
 	const methodOverride: typeof MethodOverride = require('method-override');
 	const expressSession: typeof ExpressSession = require('express-session');
-	// tslint:enable:no-var-requires
+	/* eslint-enable @typescript-eslint/no-var-requires */
 
 	app.use(compression());
 

package/src/webresource-handler/handlers/NoopHandler.ts

@@ -11,7 +11,7 @@ export class NoopHandler implements WebResourceHandler {
 		};
 	}
 
-	public async removeFile(_fileReference: string): Promise<void> {
+	public async removeFile(): Promise<void> {
 		return;
 	}
 

package/src/webresource-handler/index.ts

@@ -14,7 +14,6 @@ import {
 import { errors, permissions } from '../server-glue/module';
 import type { WebResourceType as WebResource } from '@balena/sbvr-types';
 import { TypedError } from 'typed-error';
-import { AbstractSqlTable } from '@balena/abstract-sql-compiler';
 
 export * from './handlers';
 
@@ -57,26 +56,6 @@ const getLogger = (vocab?: string): Console => {
 	return console;
 };
 
-let configuredWebResourceHandler: WebResourceHandler | undefined;
-export const setupWebresourceHandler = (handler: WebResourceHandler): void => {
-	configuredWebResourceHandler = handler;
-};
-
-export const getWebresourceHandler = (): WebResourceHandler | undefined => {
-	return configuredWebResourceHandler;
-};
-
-export const isWebResourceField = (
-	odataFieldName: string,
-	{ fields }: AbstractSqlTable,
-): boolean => {
-	const dbFieldName = odataNameToSqlName(odataFieldName);
-	return fields.some(
-		(field) =>
-			field.fieldName === dbFieldName && field.dataType === 'WebResource',
-	);
-};
-
 const isFileInValidPath = async (
 	fieldname: string,
 	req: Express.Request,
@@ -109,9 +88,11 @@ const isFileInValidPath = async (
 	}
 
 	const sqlResourceName = odataNameToSqlName(resourceName);
-	return isWebResourceField(
-		fieldname,
-		model.abstractSql.tables[sqlResourceName],
+	const fields = model.abstractSql.tables[sqlResourceName].fields;
+	const dbFieldName = odataNameToSqlName(fieldname);
+	return fields.some(
+		(field) =>
+			field.fieldName === dbFieldName && field.dataType === 'WebResource',
 	);
 };
 
@@ -175,7 +156,7 @@ export const getUploaderMiddlware = (
 		// multipart requests will have two main parts, the file contents and the form fields
 		// This receives the form fields and transforms them into a standard JSON body
 		// This is a similar behavior as previous multer library did
-		bb.on('field', (name, val, _info) => {
+		bb.on('field', (name, val) => {
 			req.body[name] = val;
 		});
 
@@ -242,12 +223,43 @@ const getCreateWebResourceHooks = (
 	return {
 		'POSTRUN-ERROR': async ({ tx, request }) => {
 			tx?.on('rollback', () => {
-				deleteRollbackPendingFields(request, webResourceHandler);
+				void deleteRollbackPendingFields(request, webResourceHandler);
 			});
 		},
 	};
 };
 
+const getReadWebResourceHooks = (
+	webResourceHandler: WebResourceHandler,
+): sbvrUtils.Hooks => {
+	return {
+		// Before returning a web resource we might need to do some modifications on the payload (e.g. presigning)
+		PRERESPOND: async ({ request, response }) => {
+			const fields = getWebResourceFields(request, false);
+
+			if (fields.length === 0) {
+				return;
+			}
+
+			if (typeof response.body === 'object' && response.body.d != null) {
+				const transformedItems = await Promise.all(
+					response.body.d.map(async (responseItem: any) => {
+						for (const field of fields) {
+							if (responseItem[field] != null) {
+								responseItem[field] = await webResourceHandler.onPreRespond(
+									responseItem[field],
+								);
+							}
+						}
+						return responseItem;
+					}),
+				);
+				response.body.d = transformedItems;
+			}
+		},
+	};
+};
+
 const isDefined = <T>(x: T | undefined | null): x is T => x != null;
 
 const getWebResourcesHrefs = (
@@ -284,7 +296,7 @@ const getRemoveWebResourceHooks = (
 
 			// Request failed on DB roundtrip (e.g. DB constraint) and pending files need to be deleted
 			tx.on('rollback', () => {
-				deleteRollbackPendingFields(request, webResourceHandler);
+				void deleteRollbackPendingFields(request, webResourceHandler);
 			});
 
 			if (request.method === 'PATCH') {
@@ -383,7 +395,7 @@ const deletePendingFiles = (
 ): void => {
 	// on purpose does not await for this promise to resolve
 	try {
-		deleteFiles(keysToDelete, webResourceHandler);
+		void deleteFiles(keysToDelete, webResourceHandler);
 	} catch (err) {
 		getLogger(request.vocabulary).error(`Failed to delete pending files`, err);
 	}
@@ -419,4 +431,11 @@ export const setupUploadHooks = (
 		resourceName,
 		getCreateWebResourceHooks(handler),
 	);
+
+	sbvrUtils.addPureHook(
+		'GET',
+		apiRoot,
+		resourceName,
+		getReadWebResourceHooks(handler),
+	);
 };

package/tsconfig.dev.json

@@ -7,6 +7,7 @@
 		"build/**/*",
 		"src/**/*",
 		"test/**/*",
-		"typings/**/*.d.ts"
+		"typings/**/*.d.ts",
+		"Gruntfile.ts"
 	]
 }

package/typings/lf-to-abstract-sql.d.ts

@@ -11,7 +11,7 @@ declare module '@balena/lf-to-abstract-sql' {
 	};
 	export const LF2AbstractSQLPrep: {
 		match: (lfModel: LFModel, rule: 'Process') => LFModel;
-		_extend({}): typeof LF2AbstractSQLPrep;
+		_extend(obj: object): typeof LF2AbstractSQLPrep;
 	};
 	export const createTranslator: (
 		types: typeof sbvrTypes,

package/typings/memoizee.d.ts

@@ -4,8 +4,7 @@ declare module 'memoizee/weak' {
 	type FirstArg<T> = T extends (arg1: infer U) => any ? U : any;
 	type RestArgs<T> = T extends (arg1: any, ...args: infer U) => any ? U : any[];
 
-	// tslint:disable-next-line ban-types
-	export interface MemoizeWeakOptions<F extends Function> {
+	export interface MemoizeWeakOptions<F extends (...args: any[]) => any> {
 		length?: number | false;
 		maxAge?: number;
 		max?: number;
@@ -17,8 +16,8 @@ declare module 'memoizee/weak' {
 		normalizer?(firstArg: FirstArg<F>, restArgs: RestArgs<F>): any;
 		resolvers?: Array<(arg: any) => any>;
 	}
-	// tslint:disable-next-line ban-types
-	function memoizeWeak<F extends Function>(
+
+	function memoizeWeak<F extends (...args: any[]) => any>(
 		f: F,
 		options?: MemoizeWeakOptions<F>,
 	): F & Memoize.Memoized<F>;