@balena/pinejs 17.1.0-build-joshbwlng-tasks-149b21c81ddf7cbb2a934500dc16e0b5ed4c74a7-1 → 17.1.0-build-model-based-typings-a10277597a28577bcb204b378925c9df795a10e8-1

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

@@ -2,6 +2,7 @@ import type * as Express from 'express';
 import type * as Db from '../database-layer/db';
 import type { Model } from '../config-loader/config-loader';
 import type { AnyObject, RequiredField } from './common-types';
+import type { Resource } from '@balena/abstract-sql-to-typescript';
 
 // Augment the Express typings
 declare global {
@@ -32,6 +33,7 @@ import {
 } from '@balena/odata-to-abstract-sql';
 import sbvrTypes from '@balena/sbvr-types';
 import deepFreeze = require('deep-freeze');
+import type { AnyResource, Params } from 'pinejs-client-core';
 import { PinejsClientCore, type PromiseResultTypes } from 'pinejs-client-core';
 
 import { ExtendedSBVRParser } from '../extended-sbvr-parser/extended-sbvr-parser';
@@ -40,9 +42,9 @@ import * as asyncMigrator from '../migrator/async';
 import * as syncMigrator from '../migrator/sync';
 import { generateODataMetadata } from '../odata-metadata/odata-metadata-generator';
 
+import type DevModel from './dev';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const devModel = require('./dev.sbvr');
-import * as tasks from '../tasks';
 import * as permissions from './permissions';
 import {
 	BadRequestError,
@@ -78,7 +80,6 @@ export {
 	addPureHook,
 	addSideEffectHook,
 } from './hooks';
-export { addTaskHandler } from '../tasks';
 
 import memoizeWeak = require('memoizee/weak');
 import * as controlFlow from './control-flow';
@@ -712,7 +713,7 @@ export const executeModels = async (
 							},
 						});
 					}
-					const result = (await api.dev.get({
+					const result = await api.dev.get({
 						resource: 'model',
 						passthrough: {
 							tx,
@@ -725,7 +726,7 @@ export const executeModels = async (
 								model_type: modelType,
 							},
 						},
-					})) as Array<{ id: number }>;
+					});
 
 					let method: SupportedMethod = 'POST';
 					let uri = '/dev/model';
@@ -775,7 +776,7 @@ export const postExecuteModels = async (tx: Db.Tx): Promise<void> => {
 	// Hence, skipped migrations from earlier models are not set as executed as the `migration` table is missing
 	// Here the skipped migrations that haven't been set properly are covered
 	// This is mostly an edge case when running on an empty database schema and migrations model hasn't been executed, yet.
-	// One specific case are tests to run tests against migrated and unmigrated database states
+	// One specifc case are tests to run tests against migrated and unmigrated database states
 
 	for (const modelKey of Object.keys(models)) {
 		const pendingToSetExecutedMigrations =
@@ -785,9 +786,6 @@ export const postExecuteModels = async (tx: Db.Tx): Promise<void> => {
 			await setExecutedMigrations(tx, modelKey, pendingToSetExecutedMigrations);
 		}
 	}
-
-	// Initialize task worker and create required hooks
-	await tasks.setup(db);
 };
 
 const cleanupModel = (vocab: string) => {
@@ -1007,7 +1005,16 @@ export type Passthrough = AnyObject & {
 	tx?: Db.Tx;
 };
 
-export class PinejsClient extends PinejsClientCore {
+export class PinejsClient<
+	M extends {
+		[key in keyof M]: Resource;
+	} = {
+		[key in string]: {
+			Read: AnyObject;
+			Write: AnyObject;
+		};
+	},
+> extends PinejsClientCore<unknown, M> {
 	public async _request({
 		method,
 		url,
@@ -1025,11 +1032,37 @@ export class PinejsClient extends PinejsClientCore {
 	}) {
 		return (await runURI(method, url, body, tx, req, custom)) as object;
 	}
+
+	public post<TResource extends keyof M & string>(
+		params: {
+			resource: TResource;
+			options: Params<M[TResource]>['options'] & { returnResource: false };
+		} & Params<M[TResource]>, // TODO: This should use the primary key rather than hardcoding `id`
+	): Promise<Pick<M[TResource]['Read'], 'id'>>;
+	public post<TResource extends keyof M & string>(
+		params: {
+			resource: TResource;
+			options?: Params<M[TResource]>['options'] & { returnResource?: true };
+		} & Params<M[TResource]>,
+	): Promise<M[TResource]['Read']>;
+	/**
+	 * @deprecated POSTing via `url` is deprecated
+	 */
+	public post<T extends Resource = AnyResource>(
+		params: {
+			resource?: undefined;
+			url: NonNullable<Params<T>['url']>;
+		} & Params<T>,
+	): Promise<T>;
+	public post(params: Params<AnyResource>): Promise<AnyObject> {
+		return super.post(params as Parameters<PinejsClient['post']>[0]);
+	}
 }
 
-export const api: {
+export interface API {
 	[vocab: string]: PinejsClient;
-} = {};
+}
+export const api = {} as API;
 export const logger: {
 	[vocab: string]: Console;
 } = {};
@@ -1136,8 +1169,8 @@ const getIdField = (
 	// TODO: Should resolveSynonym also be using the finalAbstractSqlModel?
 	getFinalAbstractSqlModel(request).tables[resolveSynonym(request)].idField;
 
-export const getAffectedIds = async (
-	args: HookArgs & {
+export const getAffectedIds = async <Vocab extends string>(
+	args: HookArgs<Vocab> & {
 		tx: Db.Tx;
 	},
 ): Promise<number[]> => {
@@ -1159,11 +1192,11 @@ export const getAffectedIds = async (
 	return request.affectedIds;
 };
 
-const $getAffectedIds = async ({
+const $getAffectedIds = async <Vocab extends string>({
 	req,
 	request,
 	tx,
-}: HookArgs & {
+}: HookArgs<Vocab> & {
 	tx: Db.Tx;
 }): Promise<number[]> => {
 	if (!['PATCH', 'DELETE'].includes(request.method)) {
@@ -1947,47 +1980,51 @@ const runDelete = async (
 	return undefined;
 };
 
+export interface API {
+	[devModelConfig.apiRoot]: PinejsClient<DevModel>;
+}
+const devModelConfig = {
+	apiRoot: 'dev',
+	modelText: devModel,
+	logging: {
+		log: false,
+	},
+	migrations: {
+		'11.0.0-modified-at': `
+			ALTER TABLE "model"
+			ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
+		`,
+		'15.0.0-data-types': async ($tx, sbvrUtils) => {
+			switch (sbvrUtils.db.engine) {
+				case 'mysql':
+					await $tx.executeSql(`\
+						ALTER TABLE "model"
+						MODIFY "model value" JSON NOT NULL;
+
+						UPDATE "model"
+						SET "model value" = CAST('{"value":' || CAST("model value" AS CHAR) || '}' AS JSON)
+						WHERE "model type" IN ('se', 'odataMetadata')
+						AND CAST("model value" AS CHAR) LIKE '"%';`);
+					break;
+				case 'postgres':
+					await $tx.executeSql(`\
+						ALTER TABLE "model"
+						ALTER COLUMN "model value" SET DATA TYPE JSONB USING "model value"::JSONB;
+
+						UPDATE "model"
+						SET "model value" = CAST('{"value":' || CAST("model value" AS TEXT) || '}' AS JSON)
+						WHERE "model type" IN ('se', 'odataMetadata')
+						AND CAST("model value" AS TEXT) LIKE '"%';`);
+					break;
+				// No need to migrate for websql
+			}
+		},
+	},
+} as const satisfies ExecutableModel;
 export const executeStandardModels = async (tx: Db.Tx): Promise<void> => {
 	try {
 		// dev model must run first
-		await executeModel(tx, {
-			apiRoot: 'dev',
-			modelText: devModel,
-			logging: {
-				log: false,
-			},
-			migrations: {
-				'11.0.0-modified-at': `
-					ALTER TABLE "model"
-					ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
-				`,
-				'15.0.0-data-types': async ($tx, sbvrUtils) => {
-					switch (sbvrUtils.db.engine) {
-						case 'mysql':
-							await $tx.executeSql(`\
-								ALTER TABLE "model"
-								MODIFY "model value" JSON NOT NULL;
-
-								UPDATE "model"
-								SET "model value" = CAST('{"value":' || CAST("model value" AS CHAR) || '}' AS JSON)
-								WHERE "model type" IN ('se', 'odataMetadata')
-								AND CAST("model value" AS CHAR) LIKE '"%';`);
-							break;
-						case 'postgres':
-							await $tx.executeSql(`\
-								ALTER TABLE "model"
-								ALTER COLUMN "model value" SET DATA TYPE JSONB USING "model value"::JSONB;
-
-								UPDATE "model"
-								SET "model value" = CAST('{"value":' || CAST("model value" AS TEXT) || '}' AS JSON)
-								WHERE "model type" IN ('se', 'odataMetadata')
-								AND CAST("model value" AS TEXT) LIKE '"%';`);
-							break;
-						// No need to migrate for websql
-					}
-				},
-			},
-		});
+		await executeModel(tx, devModelConfig);
 		await executeModels(tx, permissions.config.models);
 		console.info('Successfully executed standard models.');
 	} catch (err: any) {

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

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

package/src/sbvr-api/user.ts

@@ -0,0 +1,421 @@
+import type { Types } from '@balena/abstract-sql-to-typescript';
+
+export interface Permission {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		name: Types['Text']['Read'];
+		is_of__role?: Array<RoleHasPermission['Read']>;
+		is_of__user?: Array<UserHasPermission['Read']>;
+		is_of__api_key?: Array<ApiKeyHasPermission['Read']>;
+		user__has__permission?: Array<UserHasPermission['Read']>;
+		user_permission?: Array<UserHasPermission['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+		name: Types['Text']['Write'];
+	};
+}
+
+export interface Role {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		name: Types['Text']['Read'];
+		role__has__permission?: Array<RoleHasPermission['Read']>;
+		user__has__role?: Array<UserHasRole['Read']>;
+		user_role?: Array<UserHasRole['Read']>;
+		is_of__user?: Array<UserHasRole['Read']>;
+		is_of__api_key?: Array<ApiKeyHasRole['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+		name: Types['Text']['Write'];
+	};
+}
+
+export interface RoleHasPermission {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		role: { __id: Role['Read']['id'] } | [Role['Read']];
+		permission: { __id: Permission['Read']['id'] } | [Permission['Read']];
+		id: Types['Serial']['Read'];
+		is_of__role: { __id: Role['Read']['id'] } | [Role['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		role: Role['Write']['id'];
+		permission: Permission['Write']['id'];
+		id: Types['Serial']['Write'];
+	};
+}
+
+export interface Actor {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		is_of__user?: Array<User['Read']>;
+		api_key?: Array<ApiKey['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+	};
+}
+
+export interface User {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		actor: { __id: Actor['Read']['id'] } | [Actor['Read']];
+		username: Types['Short Text']['Read'];
+		password: Types['Hashed']['Read'];
+		user__has__role?: Array<UserHasRole['Read']>;
+		user_role?: Array<UserHasRole['Read']>;
+		user__has__permission?: Array<UserHasPermission['Read']>;
+		user_permission?: Array<UserHasPermission['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+		actor: Actor['Write']['id'];
+		username: Types['Short Text']['Write'];
+		password: Types['Hashed']['Write'];
+	};
+}
+
+export interface UserHasRole {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		user: { __id: User['Read']['id'] } | [User['Read']];
+		role: { __id: Role['Read']['id'] } | [Role['Read']];
+		id: Types['Serial']['Read'];
+		expiry_date: Types['Date Time']['Read'] | null;
+		is_of__user: { __id: User['Read']['id'] } | [User['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		user: User['Write']['id'];
+		role: Role['Write']['id'];
+		id: Types['Serial']['Write'];
+		expiry_date: Types['Date Time']['Write'] | null;
+	};
+}
+
+export interface UserHasPermission {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		user: { __id: User['Read']['id'] } | [User['Read']];
+		permission: { __id: Permission['Read']['id'] } | [Permission['Read']];
+		id: Types['Serial']['Read'];
+		expiry_date: Types['Date Time']['Read'] | null;
+		is_of__user: { __id: User['Read']['id'] } | [User['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		user: User['Write']['id'];
+		permission: Permission['Write']['id'];
+		id: Types['Serial']['Write'];
+		expiry_date: Types['Date Time']['Write'] | null;
+	};
+}
+
+export interface ApiKey {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		key: Types['Short Text']['Read'];
+		expiry_date: Types['Date Time']['Read'] | null;
+		is_of__actor: { __id: Actor['Read']['id'] } | [Actor['Read']];
+		name: Types['Text']['Read'] | null;
+		description: Types['Text']['Read'] | null;
+		api_key__has__role?: Array<ApiKeyHasRole['Read']>;
+		api_key__has__permission?: Array<ApiKeyHasPermission['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+		key: Types['Short Text']['Write'];
+		expiry_date: Types['Date Time']['Write'] | null;
+		is_of__actor: Actor['Write']['id'];
+		name: Types['Text']['Write'] | null;
+		description: Types['Text']['Write'] | null;
+	};
+}
+
+export interface ApiKeyHasRole {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		api_key: { __id: ApiKey['Read']['id'] } | [ApiKey['Read']];
+		role: { __id: Role['Read']['id'] } | [Role['Read']];
+		id: Types['Serial']['Read'];
+		is_of__api_key: { __id: ApiKey['Read']['id'] } | [ApiKey['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		api_key: ApiKey['Write']['id'];
+		role: Role['Write']['id'];
+		id: Types['Serial']['Write'];
+	};
+}
+
+export interface ApiKeyHasPermission {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		api_key: { __id: ApiKey['Read']['id'] } | [ApiKey['Read']];
+		permission: { __id: Permission['Read']['id'] } | [Permission['Read']];
+		id: Types['Serial']['Read'];
+		is_of__api_key: { __id: ApiKey['Read']['id'] } | [ApiKey['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		api_key: ApiKey['Write']['id'];
+		permission: Permission['Write']['id'];
+		id: Types['Serial']['Write'];
+	};
+}
+
+export interface Permission {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		name: Types['Text']['Read'];
+		is_of__role?: Array<RoleHasPermission['Read']>;
+		is_of__user?: Array<UserHasPermission['Read']>;
+		is_of__api_key?: Array<ApiKeyHasPermission['Read']>;
+		user__has__permission?: Array<UserHasPermission['Read']>;
+		user_permission?: Array<UserHasPermission['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+		name: Types['Text']['Write'];
+	};
+}
+
+export interface Role {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		name: Types['Text']['Read'];
+		role__has__permission?: Array<RoleHasPermission['Read']>;
+		user__has__role?: Array<UserHasRole['Read']>;
+		user_role?: Array<UserHasRole['Read']>;
+		is_of__user?: Array<UserHasRole['Read']>;
+		is_of__api_key?: Array<ApiKeyHasRole['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+		name: Types['Text']['Write'];
+	};
+}
+
+export interface RoleHasPermission {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		role: { __id: Role['Read']['id'] } | [Role['Read']];
+		permission: { __id: Permission['Read']['id'] } | [Permission['Read']];
+		id: Types['Serial']['Read'];
+		is_of__role: { __id: Role['Read']['id'] } | [Role['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		role: Role['Write']['id'];
+		permission: Permission['Write']['id'];
+		id: Types['Serial']['Write'];
+	};
+}
+
+export interface Actor {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		is_of__user?: Array<User['Read']>;
+		api_key?: Array<ApiKey['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+	};
+}
+
+export interface User {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		actor: { __id: Actor['Read']['id'] } | [Actor['Read']];
+		username: Types['Short Text']['Read'];
+		password: Types['Hashed']['Read'];
+		user__has__role?: Array<UserHasRole['Read']>;
+		user_role?: Array<UserHasRole['Read']>;
+		user__has__permission?: Array<UserHasPermission['Read']>;
+		user_permission?: Array<UserHasPermission['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+		actor: Actor['Write']['id'];
+		username: Types['Short Text']['Write'];
+		password: Types['Hashed']['Write'];
+	};
+}
+
+export interface UserHasRole {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		user: { __id: User['Read']['id'] } | [User['Read']];
+		role: { __id: Role['Read']['id'] } | [Role['Read']];
+		id: Types['Serial']['Read'];
+		expiry_date: Types['Date Time']['Read'] | null;
+		is_of__user: { __id: User['Read']['id'] } | [User['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		user: User['Write']['id'];
+		role: Role['Write']['id'];
+		id: Types['Serial']['Write'];
+		expiry_date: Types['Date Time']['Write'] | null;
+	};
+}
+
+export interface UserHasPermission {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		user: { __id: User['Read']['id'] } | [User['Read']];
+		permission: { __id: Permission['Read']['id'] } | [Permission['Read']];
+		id: Types['Serial']['Read'];
+		expiry_date: Types['Date Time']['Read'] | null;
+		is_of__user: { __id: User['Read']['id'] } | [User['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		user: User['Write']['id'];
+		permission: Permission['Write']['id'];
+		id: Types['Serial']['Write'];
+		expiry_date: Types['Date Time']['Write'] | null;
+	};
+}
+
+export interface ApiKey {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		id: Types['Serial']['Read'];
+		key: Types['Short Text']['Read'];
+		expiry_date: Types['Date Time']['Read'] | null;
+		is_of__actor: { __id: Actor['Read']['id'] } | [Actor['Read']];
+		name: Types['Text']['Read'] | null;
+		description: Types['Text']['Read'] | null;
+		api_key__has__role?: Array<ApiKeyHasRole['Read']>;
+		api_key__has__permission?: Array<ApiKeyHasPermission['Read']>;
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		id: Types['Serial']['Write'];
+		key: Types['Short Text']['Write'];
+		expiry_date: Types['Date Time']['Write'] | null;
+		is_of__actor: Actor['Write']['id'];
+		name: Types['Text']['Write'] | null;
+		description: Types['Text']['Write'] | null;
+	};
+}
+
+export interface ApiKeyHasRole {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		api_key: { __id: ApiKey['Read']['id'] } | [ApiKey['Read']];
+		role: { __id: Role['Read']['id'] } | [Role['Read']];
+		id: Types['Serial']['Read'];
+		is_of__api_key: { __id: ApiKey['Read']['id'] } | [ApiKey['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		api_key: ApiKey['Write']['id'];
+		role: Role['Write']['id'];
+		id: Types['Serial']['Write'];
+	};
+}
+
+export interface ApiKeyHasPermission {
+	Read: {
+		created_at: Types['Date Time']['Read'];
+		modified_at: Types['Date Time']['Read'];
+		api_key: { __id: ApiKey['Read']['id'] } | [ApiKey['Read']];
+		permission: { __id: Permission['Read']['id'] } | [Permission['Read']];
+		id: Types['Serial']['Read'];
+		is_of__api_key: { __id: ApiKey['Read']['id'] } | [ApiKey['Read']];
+	};
+	Write: {
+		created_at: Types['Date Time']['Write'];
+		modified_at: Types['Date Time']['Write'];
+		api_key: ApiKey['Write']['id'];
+		permission: Permission['Write']['id'];
+		id: Types['Serial']['Write'];
+	};
+}
+
+export default interface $Model {
+	permission: Permission;
+	role: Role;
+	role__has__permission: RoleHasPermission;
+	actor: Actor;
+	user: User;
+	user__has__role: UserHasRole;
+	user__has__permission: UserHasPermission;
+	api_key: ApiKey;
+	api_key__has__role: ApiKeyHasRole;
+	api_key__has__permission: ApiKeyHasPermission;
+	permission$sbvr__compiler: Permission;
+	role$sbvr__compiler: Role;
+	role__has__permission$sbvr__compiler: RoleHasPermission;
+	actor$sbvr__compiler: Actor;
+	user$sbvr__compiler: User;
+	user__has__role$sbvr__compiler: UserHasRole;
+	user__has__permission$sbvr__compiler: UserHasPermission;
+	api_key$sbvr__compiler: ApiKey;
+	api_key__has__role$sbvr__compiler: ApiKeyHasRole;
+	api_key__has__permission$sbvr__compiler: ApiKeyHasPermission;
+	// Synonyms
+	user_role: UserHasRole;
+	user_permission: UserHasPermission;
+}

package/src/server-glue/module.ts

@@ -6,7 +6,6 @@ import * as dbModule from '../database-layer/db';
 import * as configLoader from '../config-loader/config-loader';
 import * as migrator from '../migrator/sync';
 import type * as migratorUtils from '../migrator/utils';
-import * as tasks from '../tasks';
 
 import * as sbvrUtils from '../sbvr-api/sbvr-utils';
 import { PINEJS_ADVISORY_LOCK } from '../config-loader/env';
@@ -20,7 +19,6 @@ export * as errors from '../sbvr-api/errors';
 export * as env from '../config-loader/env';
 export * as types from '../sbvr-api/common-types';
 export * as hooks from '../sbvr-api/hooks';
-export * as tasks from '../tasks';
 export * as webResourceHandler from '../webresource-handler';
 export type { configLoader as ConfigLoader };
 export type { migratorUtils as Migrator };
@@ -65,7 +63,6 @@ export const init = async <T extends string>(
 		await sbvrUtils.setup(app, db);
 		const cfgLoader = await configLoader.setup(app);
 		await cfgLoader.loadConfig(migrator.config);
-		await cfgLoader.loadConfig(tasks.config);
 
 		const promises: Array<Promise<void>> = [];
 		if (process.env.SBVR_SERVER_ENABLED) {