@balena/pinejs 17.3.4-build-update-deps-04a59f892aeac34c8e1c44e9e9425e4294c65d92-1 → 17.3.4-build-rollback-sbvr-types-911495b41b7b0bd32273478fe33230fc5e20d014-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "17.3.4-build-update-deps-04a59f892aeac34c8e1c44e9e9425e4294c65d92-1",
+  "version": "17.3.4-build-rollback-sbvr-types-911495b41b7b0bd32273478fe33230fc5e20d014-1",
   "main": "out/server-glue/module",
   "type": "commonjs",
   "repository": "git@github.com:balena-io/pinejs.git",
@@ -23,30 +23,30 @@
     "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",
     "test:generated-types": "npm run generate-types && git diff --exit-code ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts",
     "mocha": "TS_NODE_FILES=true mocha",
-    "lint-fix": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.ts",
+    "prettify": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.ts",
     "generate-types": "node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/user.sbvr ./src/sbvr-api/user.ts && node ./bin/sbvr-compiler.js generate-types ./src/migrator/migrations.sbvr ./src/migrator/migrations.ts && node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/dev.sbvr ./src/sbvr-api/dev.ts && balena-lint -t tsconfig.dev.json --fix ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts"
   },
   "dependencies": {
     "@balena/abstract-sql-compiler": "^9.2.0",
-    "@balena/abstract-sql-to-typescript": "^3.3.1",
+    "@balena/abstract-sql-to-typescript": "^3.2.1",
     "@balena/env-parsing": "^1.1.12",
     "@balena/lf-to-abstract-sql": "^5.0.2",
     "@balena/odata-parser": "^3.0.8",
     "@balena/odata-to-abstract-sql": "^6.2.7",
-    "@balena/sbvr-parser": "^1.4.5",
-    "@balena/sbvr-types": "^8.0.0",
+    "@balena/sbvr-parser": "^1.4.4",
+    "@balena/sbvr-types": "^7.1.3",
     "@types/body-parser": "^1.19.5",
     "@types/compression": "^1.7.5",
     "@types/cookie-parser": "^1.4.7",
     "@types/deep-freeze": "^0.1.5",
     "@types/express": "^4.17.21",
     "@types/express-session": "^1.18.0",
-    "@types/lodash": "^4.17.7",
+    "@types/lodash": "^4.17.5",
     "@types/memoizee": "^0.4.11",
     "@types/method-override": "^0.0.35",
     "@types/multer": "^1.4.11",
     "@types/mysql": "^2.15.26",
-    "@types/node": "^20.14.11",
+    "@types/node": "^20.14.5",
     "@types/passport": "^1.0.16",
     "@types/passport-local": "^1.0.38",
     "@types/passport-strategy": "^0.2.38",
@@ -60,18 +60,18 @@
     "express-session": "^1.18.0",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.17",
-    "pinejs-client-core": "^6.15.10",
+    "pinejs-client-core": "^6.15.1",
     "randomstring": "^1.3.0",
     "typed-error": "^3.2.2"
   },
   "devDependencies": {
-    "@balena/lint": "^8.2.7",
+    "@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.7",
+    "@types/mocha": "^10.0.6",
     "@types/on-finished": "^2.3.4",
     "@types/request": "^2.48.12",
     "@types/supertest": "^6.0.2",
@@ -81,7 +81,7 @@
     "chai": "^4.4.1",
     "grunt": "^1.6.1",
     "grunt-check-dependencies": "^1.0.0",
-    "grunt-cli": "^1.5.0",
+    "grunt-cli": "^1.4.3",
     "grunt-contrib-clean": "^2.0.1",
     "grunt-contrib-concat": "^2.1.0",
     "grunt-contrib-copy": "^1.0.0",
@@ -90,12 +90,12 @@
     "grunt-text-replace": "^0.4.0",
     "grunt-ts": "^6.0.0-beta.22",
     "grunt-webpack": "^6.0.0",
-    "husky": "^9.1.1",
+    "husky": "^9.0.11",
     "lint-staged": "^15.2.7",
     "load-grunt-tasks": "^5.1.0",
-    "mocha": "^10.7.0",
+    "mocha": "^10.4.0",
     "on-finished": "^2.4.1",
-    "pinejs-client-supertest": "^2.1.1",
+    "pinejs-client-supertest": "^2.0.4",
     "raw-loader": "^4.0.2",
     "request": "^2.88.2",
     "require-npm4-to-publish": "^1.0.0",
@@ -103,14 +103,14 @@
     "terser-webpack-plugin": "^5.3.10",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.3",
-    "webpack": "^5.93.0",
+    "typescript": "^5.5.2",
+    "webpack": "^5.92.0",
     "webpack-dev-server": "^4.15.2"
   },
   "optionalDependencies": {
-    "@aws-sdk/client-s3": "^3.614.0",
-    "@aws-sdk/lib-storage": "^3.616.0",
-    "@aws-sdk/s3-request-presigner": "^3.616.0",
+    "@aws-sdk/client-s3": "^3.598.0",
+    "@aws-sdk/lib-storage": "^3.598.0",
+    "@aws-sdk/s3-request-presigner": "^3.598.0",
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "compression": "^1.7.4",
@@ -146,6 +146,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2024-07-30T11:31:08.392Z"
+    "publishedAt": "2024-07-30T11:55:20.555Z"
   }
 }

package/src/bin/utils.ts

@@ -92,7 +92,7 @@ export const getAbstractSqlModelFromFile = (
 		}
 		const configModel = getConfigModel(fileContents, modelName);
 		if ('abstractSql' in configModel && configModel.abstractSql != null) {
-			return configModel.abstractSql;
+			return configModel.abstractSql as AbstractSqlModel;
 		} else if ('modelText' in configModel && configModel.modelText != null) {
 			seModel = configModel.modelText;
 		} else if ('modelFile' in configModel && configModel.modelFile != null) {

package/src/database-layer/db.ts

@@ -423,7 +423,7 @@ export abstract class Tx {
 		/* eslint-disable @typescript-eslint/no-unused-vars */
 		_namespaceKey: string,
 		_key: number,
-		_blocking = true,
+		_blocking: boolean = true,
 		/* eslint-enable @typescript-eslint/no-unused-vars */
 	): Promise<boolean> {
 		throw new Error(
@@ -663,7 +663,7 @@ if (maybePg != null) {
 			public override async getTxLevelLock(
 				namespaceKey: string,
 				key: number,
-				blocking = true,
+				blocking: boolean = true,
 			) {
 				validateTransactionLockParameter(key, 'key');
 				const namespaceId = transactionLockNamespaceMap[namespaceKey];
@@ -693,7 +693,7 @@ if (maybePg != null) {
 				}
 			}
 
-			public async tableList(extraWhereClause = '') {
+			public async tableList(extraWhereClause: string = '') {
 				if (extraWhereClause !== '') {
 					extraWhereClause = 'WHERE ' + extraWhereClause;
 				}
@@ -811,7 +811,7 @@ if (maybeMysql != null) {
 				await promise;
 			}
 
-			public async tableList(extraWhereClause = '') {
+			public async tableList(extraWhereClause: string = '') {
 				if (extraWhereClause !== '') {
 					extraWhereClause = ' WHERE ' + extraWhereClause;
 				}
@@ -834,18 +834,14 @@ if (maybeMysql != null) {
 			executeSql: atomicExecuteSql,
 			transaction: createTransaction(async (stackTraceErr, timeoutMS) => {
 				const client = await getConnectionAsync();
-				const close = () => {
-					client.release();
-				};
+				const close = () => client.release();
 				const tx = new MySqlTx(client, close, false, stackTraceErr, timeoutMS);
 				void tx.executeSql('START TRANSACTION;');
 				return tx;
 			}),
 			readTransaction: createTransaction(async (stackTraceErr, timeoutMS) => {
 				const client = await getConnectionAsync();
-				const close = () => {
-					client.release();
-				};
+				const close = () => client.release();
 				const tx = new MySqlTx(client, close, false, stackTraceErr, timeoutMS);
 				void tx.executeSql('START TRANSACTION READ ONLY;');
 				return tx.asReadOnly();
@@ -930,14 +926,14 @@ if (typeof window !== 'undefined' && window.openDatabase != null) {
 			}
 
 			protected async _rollback(): Promise<void> {
-				await this.tx.rollback();
+				return await this.tx.rollback();
 			}
 
 			protected async _commit() {
 				this.tx.commit();
 			}
 
-			public async tableList(extraWhereClause = '') {
+			public async tableList(extraWhereClause: string = '') {
 				if (extraWhereClause !== '') {
 					extraWhereClause = ' AND ' + extraWhereClause;
 				}
@@ -991,7 +987,7 @@ if (typeof window !== 'undefined' && window.openDatabase != null) {
 			}
 
 			public async rollback(): Promise<void> {
-				await new Promise<void>((resolve) => {
+				return await new Promise((resolve) => {
 					const successCallback: SQLStatementCallback = () => {
 						resolve();
 						throw new Error('Rollback');

package/src/express-emulator/express.js

@@ -80,7 +80,7 @@ const app = (function () {
 			},
 		};
 		console.log(method, uri, body);
-		if (uri.endsWith('/')) {
+		if (uri.slice(-1) === '/') {
 			uri = uri.slice(0, uri.length - 1);
 		}
 		uri = uri.toLowerCase();
@@ -142,7 +142,10 @@ const app = (function () {
 			const checkMethodHandlers = () => {
 				i++;
 				if (i < methodHandlers.length) {
-					if (uri.startsWith(methodHandlers[i].match)) {
+					if (
+						uri.slice(0, methodHandlers[i].match.length) ===
+						methodHandlers[i].match
+					) {
 						j = -1;
 						// Reset params that may have been added on previous routes that failed in middleware
 						req.params = {};

package/src/passport-pinejs/mount-login-router.ts

@@ -12,7 +12,11 @@ export const mountLoginRouter = async (
 		configLoader.loadConfig(PinejsSessionStore.config),
 	]);
 
-	if (typeof process === 'undefined' || !process?.env.DISABLE_DEFAULT_AUTH) {
+	if (
+		typeof process === 'undefined' ||
+		process == null ||
+		!process.env.DISABLE_DEFAULT_AUTH
+	) {
 		expressApp.post(
 			'/login',
 			passportPinejs.login((err, user, req, res) => {

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

@@ -68,8 +68,7 @@ const setup: ConfigLoader.SetupFunction = (app: Express.Application) => {
 		logout = (req, _res, next) => {
 			req.logout((error) => {
 				if (error) {
-					next(error);
-					return;
+					return next(error);
 				}
 				next();
 			});
@@ -84,7 +83,7 @@ const setup: ConfigLoader.SetupFunction = (app: Express.Application) => {
 			next();
 		});
 
-		login = (fn) => (req, res, next) => {
+		login = (fn) => (req, res, next) =>
 			checkPassword(req.body.username, req.body.password, (err, user) => {
 				if (user) {
 					loggedIn = true;
@@ -92,7 +91,6 @@ const setup: ConfigLoader.SetupFunction = (app: Express.Application) => {
 				}
 				fn(err, user, req, res, next);
 			});
-		};
 
 		logout = (req, _res, next) => {
 			delete req.user;

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

@@ -153,7 +153,7 @@ export class PinejsSessionStore extends Store {
 						},
 					},
 				},
-			}),
+			}) as Promise<number>,
 		);
 	}) as Store['length'];
 

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

@@ -77,7 +77,7 @@ export const getAndCheckBindValues = async (
 	const sqlModelTables = sbvrUtils.getAbstractSqlModel(request).tables;
 	return await Promise.all(
 		bindings.map(async (binding) => {
-			let fieldName = '';
+			let fieldName: string = '';
 			let field: { dataType: string };
 			let value: any;
 			if (binding[0] === 'Bind') {

package/src/sbvr-api/hooks.ts

@@ -101,7 +101,7 @@ class Hook<T extends HookFn> {
 
 class SideEffectHook<T extends HookFn> extends Hook<T> {
 	private rollbackFns: RollbackAction[] = [];
-	private rolledBack = false;
+	private rolledBack: boolean = false;
 
 	public registerRollback(fn: RollbackAction): void {
 		if (this.rolledBack) {
@@ -243,9 +243,7 @@ export const getHooks = (
 		),
 	);
 };
-getHooks.clear = () => {
-	getMethodHooks.clear();
-};
+getHooks.clear = () => getMethodHooks.clear();
 
 interface VocabHooks {
 	[resourceName: string]: HookBlueprints;
@@ -341,7 +339,7 @@ export const addHook = <Vocab extends string>(
 		const hook = hooks[hookType];
 		resourceHooks[hookType] ??= [];
 		if (hook != null) {
-			resourceHooks[hookType].push(hook);
+			resourceHooks[hookType]!.push(hook);
 		}
 	}
 

package/src/sbvr-api/permissions.ts

@@ -334,7 +334,12 @@ const getPermissionsLookup = env.createCache(
 				permissionsLookup[target] = true;
 			} else if (permissionsLookup[target] !== true) {
 				permissionsLookup[target] ??= [];
-				permissionsLookup[target].push(condition);
+				(
+					permissionsLookup[target] as Exclude<
+						PermissionLookup[typeof target],
+						true
+					>
+				).push(condition);
 			}
 		}
 		// Ensure there are no duplicate conditions as applying both would be wasteful
@@ -941,7 +946,7 @@ const rewriteRelationships = (
 	);
 
 	const newRelationships = _.cloneDeep(relationships);
-	_.forOwn(newRelationships, (value, name) => {
+	_.forOwn(newRelationships, (value, name) =>
 		rewriteRelationship(
 			value,
 			name,
@@ -949,8 +954,8 @@ const rewriteRelationships = (
 			permissionsLookup,
 			vocabulary,
 			odata2AbstractSQL,
-		);
-	});
+		),
+	);
 
 	return newRelationships;
 };
@@ -1635,7 +1640,7 @@ const getReqPermissions = async (
 	if (req.user?.permissions != null) {
 		addActorPermissions(req.user.actor, req.user.permissions);
 	} else if (req.apiKey?.permissions != null) {
-		addActorPermissions(req.apiKey.actor, req.apiKey.permissions);
+		addActorPermissions(req.apiKey.actor!, req.apiKey.permissions);
 	}
 
 	return getPermissionsLookup(actorPermissions, guestPermissions);

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

@@ -209,7 +209,7 @@ const memoizedResolveNavigationResource = memoizeWeak(
 		const mapping = _.get(
 			abstractSqlModel.relationships[resolvedResourceName],
 			navigation,
-		);
+		) as undefined | AbstractSQLCompiler.RelationshipMapping;
 		if (mapping == null) {
 			throw new Error(
 				`Cannot navigate from '${resourceName}' to '${navigationName}'`,
@@ -701,7 +701,7 @@ export const executeModels = async (
 			compiledModels.map(async (model: CompiledModel) => {
 				const updateModel = async (modelType: keyof CompiledModel) => {
 					if (model[modelType] == null) {
-						await api.dev.delete({
+						return await api.dev.delete({
 							resource: 'model',
 							passthrough: {
 								tx,
@@ -714,7 +714,6 @@ export const executeModels = async (
 								},
 							},
 						});
-						return;
 					}
 					const result = await api.dev.get({
 						resource: 'model',
@@ -1055,7 +1054,7 @@ export class PinejsClient<
 			url: NonNullable<Params<T>['url']>;
 		} & Params<T>,
 	): Promise<AnyObject>;
-	public post(params: Params): Promise<AnyObject> {
+	public post(params: Params<AnyResource>): Promise<AnyObject> {
 		return super.post(params as Parameters<PinejsClient['post']>[0]);
 	}
 }
@@ -1459,8 +1458,7 @@ export const getApiRoot = (req: Express.Request): string | undefined => {
 export const handleODataRequest: Express.Handler = async (req, res, next) => {
 	const apiRoot = getApiRoot(req);
 	if (apiRoot == null || models[apiRoot] == null) {
-		next('route');
-		return;
+		return next('route');
 	}
 
 	try {
@@ -1523,7 +1521,7 @@ export const handleHttpErrors = (
 	return false;
 };
 const handleResponse = (res: Express.Response, response: Response): void => {
-	const { body, headers, statusCode } = response;
+	const { body, headers, statusCode } = response as Response;
 	res.set(headers);
 	res.status(statusCode);
 	if (!body) {
@@ -1753,7 +1751,7 @@ const runQuery = async (
 	tx: Db.Tx,
 	request: uriParser.ODataRequest,
 	queryIndex?: number,
-	addReturning = false,
+	addReturning: boolean = false,
 ): Promise<Db.Result> => {
 	const { vocabulary } = request;
 	let { sqlQuery } = request;

package/src/sbvr-api/translations.ts

@@ -208,7 +208,7 @@ export const translateAbstractSqlModel = (
 			const { $toResource, ...definition } = translationDefinition;
 			const hasToResource = typeof $toResource === 'string';
 			if (hasToResource) {
-				resourceRenames[key] = $toResource;
+				resourceRenames[key] = `${$toResource}`;
 			}
 			const toResource = hasToResource ? $toResource : `${key}$${toVersion}`;
 			// TODO: Should this use the toAbstractSqlModel?

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

@@ -282,7 +282,7 @@ export function parseOData(
 			// 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.startsWith('/'));
+			const sortedCS = _.sortBy(b.changeSet, (el) => el.url[0] !== '/');
 			const csReferences = new Map<
 				ParsedODataRequest['id'],
 				ParsedODataRequest
@@ -338,7 +338,7 @@ const parseODataChangeset = (
 	let apiRoot: string;
 	let url;
 
-	if (b.url.startsWith('/')) {
+	if (b.url[0] === '/') {
 		({ url, apiRoot } = splitApiRoot(b.url));
 		odata = memoizedParseOdata(url);
 		defer = false;

package/src/webresource-handler/index.ts

@@ -116,8 +116,7 @@ export const getUploaderMiddlware = (
 ): Express.RequestHandler => {
 	return (req, res, next) => {
 		if (!req.is('multipart')) {
-			next();
-			return;
+			return next();
 		}
 		const uploadedFilePaths: string[] = [];
 		const completeUploads: Array<Promise<void>> = [];