@balena/pinejs 15.0.0-delete-state-default-user-permissions-8b5de27c634f2e7581f0bcf3600066d2fe4bbf40 → 15.0.0-deprecate-node12-8a99d72ae66d7708293afc56c5d7eb19b39081cd

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

@@ -37,20 +37,22 @@ export interface UnparsedRequest {
 	_isChangeSet?: boolean;
 }
 
-export interface ODataRequest {
+export interface ParsedODataRequest {
 	method: SupportedMethod;
 	url: string;
+	vocabulary: string;
+	resourceName: string;
+	values: AnyObject;
 	odataQuery: ODataQuery;
 	odataBinds: OdataBinds;
-	values: AnyObject;
+	custom: AnyObject;
+	id?: number | undefined;
+	_defer?: boolean;
+}
+export interface ODataRequest extends ParsedODataRequest {
 	abstractSqlModel?: AbstractSQLCompiler.AbstractSqlModel;
 	abstractSqlQuery?: AbstractSQLCompiler.AbstractSqlQuery;
 	sqlQuery?: AbstractSQLCompiler.SqlResult | AbstractSQLCompiler.SqlResult[];
-	resourceName: string;
-	vocabulary: string;
-	_defer?: boolean;
-	id?: number | undefined;
-	custom: AnyObject;
 	tx?: Tx;
 	modifiedFields?: ReturnType<
 		AbstractSQLCompiler.EngineInstance['getModifiedFields']
@@ -58,7 +60,7 @@ export interface ODataRequest {
 	affectedIds?: number[];
 	pendingAffectedIds?: Promise<number[]>;
 	hooks?: InstantiatedHooks;
-	engine?: AbstractSQLCompiler.Engines;
+	engine: AbstractSQLCompiler.Engines;
 }
 
 // Converts a value to its string representation and tries to parse is as an
@@ -96,12 +98,12 @@ export const memoizedParseOdata = (() => {
 				// Try to cache based on parameter aliases if there might be some
 				const parameterAliases = new URLSearchParams();
 				const queryParams = new URLSearchParams(url.slice(queryParamsIndex));
-				Array.from(queryParams.entries()).forEach(([key, value]) => {
+				for (const [key, value] of Array.from(queryParams.entries())) {
 					if (key.startsWith('@')) {
 						parameterAliases.append(key, value);
 						queryParams.delete(key);
 					}
-				});
+				}
 				const parameterAliasesString = parameterAliases.toString();
 				if (parameterAliasesString !== '') {
 					const parsed = _.cloneDeep(
@@ -257,23 +259,26 @@ export const metadataEndpoints = ['$metadata', '$serviceroot'];
 
 export async function parseOData(
 	b: UnparsedRequest & { _isChangeSet?: false },
-): Promise<ODataRequest>;
+): Promise<ParsedODataRequest>;
 export async function parseOData(
 	b: UnparsedRequest & { _isChangeSet: true },
-): Promise<ODataRequest[]>;
+): Promise<ParsedODataRequest[]>;
 export async function parseOData(
 	b: UnparsedRequest,
-): Promise<ODataRequest | ODataRequest[]>;
+): Promise<ParsedODataRequest | ParsedODataRequest[]>;
 export async function parseOData(
 	b: UnparsedRequest,
-): Promise<ODataRequest | ODataRequest[]> {
+): Promise<ParsedODataRequest | ParsedODataRequest[]> {
 	try {
 		if (b._isChangeSet && b.changeSet != null) {
 			// We sort the CS set once, we must assure that requests which reference
 			// other requests in the changeset are placed last. Once they are sorted
 			// Map will guarantee retrival of results in insertion order
 			const sortedCS = _.sortBy(b.changeSet, (el) => el.url[0] !== '/');
-			const csReferences = new Map<ODataRequest['id'], ODataRequest>();
+			const csReferences = new Map<
+				ParsedODataRequest['id'],
+				ParsedODataRequest
+			>();
 			for (const cs of sortedCS) {
 				parseODataChangeset(csReferences, cs);
 			}
@@ -287,14 +292,14 @@ export async function parseOData(
 				url,
 				vocabulary: apiRoot,
 				resourceName: odata.tree.resource,
-				odataBinds: odata.binds,
-				odataQuery: odata.tree,
 				values: b.data ?? {},
+				odataQuery: odata.tree,
+				odataBinds: odata.binds,
 				custom: {},
 				_defer: false,
 			};
 		}
-	} catch (err) {
+	} catch (err: any) {
 		if (err instanceof ODataParser.SyntaxError) {
 			throw new BadRequestError(`Malformed url: '${b.url}'`);
 		}
@@ -307,10 +312,13 @@ export async function parseOData(
 }
 
 const parseODataChangeset = (
-	csReferences: Map<ODataRequest['id'], ODataRequest>,
+	csReferences: Map<ParsedODataRequest['id'], ParsedODataRequest>,
 	b: UnparsedRequest,
 ): void => {
-	const contentId: ODataRequest['id'] = mustExtractHeader(b, 'content-id');
+	const contentId: ParsedODataRequest['id'] = mustExtractHeader(
+		b,
+		'content-id',
+	);
 
 	if (csReferences.has(contentId)) {
 		throw new BadRequestError('Content-Id must be unique inside a changeset');
@@ -341,7 +349,7 @@ const parseODataChangeset = (
 		defer = true;
 	}
 
-	const parseResult: ODataRequest = {
+	const parseResult: ParsedODataRequest = {
 		method: b.method as SupportedMethod,
 		url,
 		vocabulary: apiRoot,

package/src/server-glue/module.ts

@@ -73,7 +73,7 @@ export const init = async <T extends string>(
 		await Promise.all(promises);
 
 		return cfgLoader;
-	} catch (err) {
+	} catch (err: any) {
 		console.error('Error initialising server', err, err.stack);
 		process.exit(1);
 	}

package/tsconfig.json

@@ -3,8 +3,6 @@
 		"module": "commonjs",
 		"strict": true,
 		"strictFunctionTypes": false,
-		"strictPropertyInitialization": false,
-		"useUnknownInCatchVariables": false,
 		"noImplicitThis": false,
 		"noUnusedParameters": true,
 		"noUnusedLocals": true,
@@ -13,7 +11,7 @@
 		"removeComments": true,
 		"rootDir": "src",
 		"sourceMap": true,
-		"target": "es2018",
+		"target": "es2019",
 		"declaration": true,
 		"skipLibCheck": true,
 		"resolveJsonModule": true,

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

@@ -1,22 +1,19 @@
 declare module '@balena/lf-to-abstract-sql' {
+	import type sbvrTypes = require('@balena/sbvr-types');
+	import type { LFModel } from '@balena/sbvr-parser';
+	import type { AbstractSqlModel } from '@balena/abstract-sql-compiler';
 	export const LF2AbstractSQL: {
 		createInstance: () => {
-			match: (
-				lfModel: LFModel,
-				rule: 'Process',
-			) => AbstractSQLCompiler.AbstractSqlModel;
+			match: (lfModel: LFModel, rule: 'Process') => AbstractSqlModel;
 			addTypes: (types: typeof sbvrTypes) => void;
 			reset: () => void;
 		};
 	};
 	export const LF2AbstractSQLPrep: {
 		match: (lfModel: LFModel, rule: 'Process') => LFModel;
-		_extend({}): typeof LF2AbstractSQL.LF2AbstractSQLPrep;
+		_extend({}): typeof LF2AbstractSQLPrep;
 	};
 	export const createTranslator: (
 		types: typeof sbvrTypes,
-	) => (
-		lfModel: LFModel,
-		rule: 'Process',
-	) => AbstractSQLCompiler.AbstractSqlModel;
+	) => (lfModel: LFModel, rule: 'Process') => AbstractSqlModel;
 }