@balena/pinejs 15.0.0-delete-state-default-user-permissions-981931563dc47b2a8b873bc787d7dacfcc6c52e3 → 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

@@ -4,7 +4,8 @@ import './sbvr-loader';
 
 import * as dbModule from '../database-layer/db';
 import * as configLoader from '../config-loader/config-loader';
-import * as migrator from '../migrator/migrator';
+import * as migrator from '../migrator/sync';
+import * as migratorUtils from '../migrator/utils';
 
 import * as sbvrUtils from '../sbvr-api/sbvr-utils';
 
@@ -17,7 +18,7 @@ export * as env from '../config-loader/env';
 export * as types from '../sbvr-api/common-types';
 export * as hooks from '../sbvr-api/hooks';
 export type { configLoader as ConfigLoader };
-export type { migrator as Migrator };
+export type { migratorUtils as Migrator };
 
 let envDatabaseOptions: dbModule.DatabaseOptions<string>;
 if (dbModule.engines.websql != null) {
@@ -72,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;
 }

package/out/migrator/migrator.d.ts

@@ -1,17 +0,0 @@
-import type { Tx } from '../database-layer/db';
-import type { Resolvable } from '../sbvr-api/common-types';
-import type { Config, Model } from '../config-loader/config-loader';
-import { TypedError } from 'typed-error';
-import * as sbvrUtils from '../sbvr-api/sbvr-utils';
-declare type ApiRootModel = Model & {
-    apiRoot: string;
-};
-declare type SbvrUtils = typeof sbvrUtils;
-export declare type MigrationFn = (tx: Tx, sbvrUtils: SbvrUtils) => Resolvable<void>;
-export declare type Migration = string | MigrationFn;
-export declare class MigrationError extends TypedError {
-}
-export declare const postRun: (tx: Tx, model: ApiRootModel) => Promise<void>;
-export declare const run: (tx: Tx, model: ApiRootModel) => Promise<void>;
-export declare const config: Config;
-export {};

package/out/migrator/migrator.js

@@ -1,185 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = exports.run = exports.postRun = exports.MigrationError = void 0;
-const _ = require("lodash");
-const typed_error_1 = require("typed-error");
-const env_1 = require("../config-loader/env");
-const sbvrUtils = require("../sbvr-api/sbvr-utils");
-const control_flow_1 = require("../sbvr-api/control-flow");
-const modelText = require('./migrations.sbvr');
-class MigrationError extends typed_error_1.TypedError {
-}
-exports.MigrationError = MigrationError;
-const binds = (strings, ...bindNums) => strings
-    .map((str, i) => {
-    if (i === bindNums.length) {
-        return str;
-    }
-    if (i + 1 !== bindNums[i]) {
-        throw new SyntaxError('Migration sql binds must be sequential');
-    }
-    if (sbvrUtils.db.engine === "postgres") {
-        return str + `$${bindNums[i]}`;
-    }
-    return str + `?`;
-})
-    .join('');
-const postRun = async (tx, model) => {
-    var _a, _b;
-    const { initSql } = model;
-    if (initSql == null) {
-        return;
-    }
-    const modelName = model.apiRoot;
-    const exists = await checkModelAlreadyExists(tx, modelName);
-    if (!exists) {
-        ((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.info) !== null && _b !== void 0 ? _b : console.info)('First time executing, running init script');
-        await lockMigrations(tx, modelName, async () => {
-            await tx.executeSql(initSql);
-        });
-    }
-};
-exports.postRun = postRun;
-const run = async (tx, model) => {
-    var _a, _b;
-    const { migrations } = model;
-    if (migrations == null || _.isEmpty(migrations)) {
-        return;
-    }
-    const modelName = model.apiRoot;
-    const exists = await checkModelAlreadyExists(tx, modelName);
-    if (!exists) {
-        ((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.info) !== null && _b !== void 0 ? _b : console.info)('First time model has executed, skipping migrations');
-        return await setExecutedMigrations(tx, modelName, Object.keys(migrations));
-    }
-    await lockMigrations(tx, modelName, async () => {
-        const executedMigrations = await getExecutedMigrations(tx, modelName);
-        const pendingMigrations = filterAndSortPendingMigrations(migrations, executedMigrations);
-        if (pendingMigrations.length === 0) {
-            return;
-        }
-        const newlyExecutedMigrations = await executeMigrations(tx, pendingMigrations);
-        await setExecutedMigrations(tx, modelName, [
-            ...executedMigrations,
-            ...newlyExecutedMigrations,
-        ]);
-    });
-};
-exports.run = run;
-const checkModelAlreadyExists = async (tx, modelName) => {
-    const result = await tx.tableList("name = 'migration'");
-    if (result.rows.length === 0) {
-        return false;
-    }
-    const { rows } = await tx.executeSql(binds `
-SELECT 1
-FROM "model"
-WHERE "model"."is of-vocabulary" = ${1}
-LIMIT 1`, [modelName]);
-    return rows.length > 0;
-};
-const getExecutedMigrations = async (tx, modelName) => {
-    const { rows } = await tx.executeSql(binds `
-SELECT "migration"."executed migrations" AS "executed_migrations"
-FROM "migration"
-WHERE "migration"."model name" = ${1}`, [modelName]);
-    const data = rows[0];
-    if (data == null) {
-        return [];
-    }
-    return JSON.parse(data.executed_migrations);
-};
-const setExecutedMigrations = async (tx, modelName, executedMigrations) => {
-    const stringifiedMigrations = JSON.stringify(executedMigrations);
-    const result = await tx.tableList("name = 'migration'");
-    if (result.rows.length === 0) {
-        return;
-    }
-    const { rowsAffected } = await tx.executeSql(binds `
-UPDATE "migration"
-SET "model name" = ${1},
-"executed migrations" = ${2}
-WHERE "migration"."model name" = ${3}`, [modelName, stringifiedMigrations, modelName]);
-    if (rowsAffected === 0) {
-        await tx.executeSql(binds `
-INSERT INTO "migration" ("model name", "executed migrations")
-VALUES (${1}, ${2})`, [modelName, stringifiedMigrations]);
-    }
-};
-const filterAndSortPendingMigrations = (migrations, executedMigrations) => _(migrations).omit(executedMigrations)
-    .toPairs()
-    .sortBy(([migrationKey]) => migrationKey)
-    .value();
-const lockMigrations = async (tx, modelName, fn) => {
-    try {
-        await tx.executeSql(binds `
-DELETE FROM "migration lock"
-WHERE "model name" = ${1}
-AND "created at" < ${2}`, [modelName, new Date(Date.now() - env_1.migrator.lockTimeout)]);
-        await tx.executeSql(binds `
-INSERT INTO "migration lock" ("model name")
-VALUES (${1})`, [modelName]);
-    }
-    catch (err) {
-        await (0, control_flow_1.delay)(env_1.migrator.lockFailDelay);
-        throw err;
-    }
-    try {
-        return await fn();
-    }
-    finally {
-        try {
-            await tx.executeSql(binds `
-DELETE FROM "migration lock"
-WHERE "model name" = ${1}`, [modelName]);
-        }
-        catch (_a) {
-        }
-    }
-};
-const executeMigrations = async (tx, migrations = []) => {
-    var _a, _b;
-    try {
-        for (const migration of migrations) {
-            await executeMigration(tx, migration);
-        }
-    }
-    catch (err) {
-        ((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.error) !== null && _b !== void 0 ? _b : console.error)('Error while executing migrations, rolled back');
-        throw new MigrationError(err);
-    }
-    return migrations.map(([migrationKey]) => migrationKey);
-};
-const executeMigration = async (tx, [key, migration]) => {
-    var _a, _b;
-    ((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.info) !== null && _b !== void 0 ? _b : console.info)(`Running migration ${JSON.stringify(key)}`);
-    if (typeof migration === 'function') {
-        await migration(tx, sbvrUtils);
-    }
-    else if (typeof migration === 'string') {
-        await tx.executeSql(migration);
-    }
-    else {
-        throw new MigrationError(`Invalid migration type: ${typeof migration}`);
-    }
-};
-exports.config = {
-    models: [
-        {
-            modelName: 'migrations',
-            apiRoot: 'migrations',
-            modelText,
-            migrations: {
-                '11.0.0-modified-at': `
-					ALTER TABLE "migration"
-					ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
-				`,
-                '11.0.1-modified-at': `
-					ALTER TABLE "migration lock"
-					ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
-				`,
-            },
-        },
-    ],
-};
-//# sourceMappingURL=migrator.js.map

package/out/migrator/migrator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/migrator/migrator.ts"],"names":[],"mappings":";;;AAKA,4BAA4B;AAC5B,6CAAyC;AACzC,8CAA+D;AAC/D,oDAAoD;AACpD,2DAAiD;AAGjD,MAAM,SAAS,GAAW,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAYvD,MAAa,cAAe,SAAQ,wBAAU;CAAG;AAAjD,wCAAiD;AAIjD,MAAM,KAAK,GAAG,CAAC,OAA6B,EAAE,GAAG,QAAkB,EAAE,EAAE,CACtE,OAAO;KACL,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;IACf,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,EAAE;QAC1B,OAAO,GAAG,CAAC;KACX;IACD,IAAI,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE;QAC1B,MAAM,IAAI,WAAW,CAAC,wCAAwC,CAAC,CAAC;KAChE;IACD,IAAI,SAAS,CAAC,EAAE,CAAC,MAAM,eAAqB,EAAE;QAC7C,OAAO,GAAG,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/B;IACD,OAAO,GAAG,GAAG,GAAG,CAAC;AAClB,CAAC,CAAC;KACD,IAAI,CAAC,EAAE,CAAC,CAAC;AAEL,MAAM,OAAO,GAAG,KAAK,EAAE,EAAM,EAAE,KAAmB,EAAiB,EAAE;;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,IAAI,OAAO,IAAI,IAAI,EAAE;QACpB,OAAO;KACP;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC;IAEhC,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,EAAE;QACZ,CAAC,MAAA,MAAA,SAAS,CAAC,GAAG,CAAC,UAAU,0CAAE,MAAM,CAAC,IAAI,mCAAI,OAAO,CAAC,IAAI,CAAC,CACtD,2CAA2C,CAC3C,CAAC;QACF,MAAM,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;KACH;AACF,CAAC,CAAC;AAjBW,QAAA,OAAO,WAiBlB;AAEK,MAAM,GAAG,GAAG,KAAK,EAAE,EAAM,EAAE,KAAmB,EAAiB,EAAE;;IACvE,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC7B,IAAI,UAAU,IAAI,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAChD,OAAO;KACP;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC;IAIhC,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,EAAE;QACZ,CAAC,MAAA,MAAA,SAAS,CAAC,GAAG,CAAC,UAAU,0CAAE,MAAM,CAAC,IAAI,mCAAI,OAAO,CAAC,IAAI,CAAC,CACtD,oDAAoD,CACpD,CAAC;QAEF,OAAO,MAAM,qBAAqB,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;KAC3E;IACD,MAAM,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACtE,MAAM,iBAAiB,GAAG,8BAA8B,CACvD,UAAU,EACV,kBAAkB,CAClB,CAAC;QACF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;YACnC,OAAO;SACP;QAED,MAAM,uBAAuB,GAAG,MAAM,iBAAiB,CACtD,EAAE,EACF,iBAAiB,CACjB,CAAC;QACF,MAAM,qBAAqB,CAAC,EAAE,EAAE,SAAS,EAAE;YAC1C,GAAG,kBAAkB;YACrB,GAAG,uBAAuB;SAC1B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AArCW,QAAA,GAAG,OAqCd;AAEF,MAAM,uBAAuB,GAAG,KAAK,EACpC,EAAM,EACN,SAAiB,EACE,EAAE;IACrB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IACxD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,KAAK,CAAC;KACb;IACD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,UAAU,CACnC,KAAK,CAAA;;;qCAG8B,CAAC;QAC9B,EACN,CAAC,SAAS,CAAC,CACX,CAAC;IAEF,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,KAAK,EAClC,EAAM,EACN,SAAiB,EACG,EAAE;IACtB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,UAAU,CACnC,KAAK,CAAA;;;mCAG4B,CAAC,EAAE,EACpC,CAAC,SAAS,CAAC,CACX,CAAC;IAEF,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACrB,IAAI,IAAI,IAAI,IAAI,EAAE;QACjB,OAAO,EAAE,CAAC;KACV;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAa,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,KAAK,EAClC,EAAM,EACN,SAAiB,EACjB,kBAA4B,EACZ,EAAE;IAClB,MAAM,qBAAqB,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAEjE,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IACxD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO;KACP;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC,UAAU,CAC3C,KAAK,CAAA;;qBAEc,CAAC;0BACI,CAAC;mCACQ,CAAC,EAAE,EACpC,CAAC,SAAS,EAAE,qBAAqB,EAAE,SAAS,CAAC,CAC7C,CAAC;IAEF,IAAI,YAAY,KAAK,CAAC,EAAE;QACvB,MAAM,EAAE,CAAC,UAAU,CAClB,KAAK,CAAA;;UAEE,CAAC,KAAK,CAAC,GAAG,EACjB,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAClC,CAAC;KACF;AACF,CAAC,CAAC;AAIF,MAAM,8BAA8B,GAAG,CACtC,UAA4C,EAC5C,kBAA4B,EACT,EAAE,CACpB,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAiC;KACrE,OAAO,EAAE;KACT,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC;KACxC,KAAK,EAAE,CAAC;AAEX,MAAM,cAAc,GAAG,KAAK,EAC3B,EAAM,EACN,SAAiB,EACjB,EAAoB,EACP,EAAE;IACf,IAAI;QACH,MAAM,EAAE,CAAC,UAAU,CAClB,KAAK,CAAA;;uBAEe,CAAC;qBACH,CAAC,EAAE,EACrB,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAW,CAAC,WAAW,CAAC,CAAC,CAC3D,CAAC;QACF,MAAM,EAAE,CAAC,UAAU,CAClB,KAAK,CAAA;;UAEE,CAAC,GAAG,EACX,CAAC,SAAS,CAAC,CACX,CAAC;KACF;IAAC,OAAO,GAAG,EAAE;QACb,MAAM,IAAA,oBAAK,EAAC,cAAW,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,GAAG,CAAC;KACV;IACD,IAAI;QACH,OAAO,MAAM,EAAE,EAAE,CAAC;KAClB;YAAS;QACT,IAAI;YACH,MAAM,EAAE,CAAC,UAAU,CAClB,KAAK,CAAA;;uBAEc,CAAC,EAAE,EACtB,CAAC,SAAS,CAAC,CACX,CAAC;SACF;QAAC,WAAM;SAIP;KACD;AACF,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,KAAK,EAC9B,EAAM,EACN,aAA+B,EAAE,EACb,EAAE;;IACtB,IAAI;QACH,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,MAAM,gBAAgB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;SACtC;KACD;IAAC,OAAO,GAAG,EAAE;QACb,CAAC,MAAA,MAAA,SAAS,CAAC,GAAG,CAAC,UAAU,0CAAE,MAAM,CAAC,KAAK,mCAAI,OAAO,CAAC,KAAK,CAAC,CACxD,+CAA+C,CAC/C,CAAC;QACF,MAAM,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC;KAC9B;IACD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAC7B,EAAM,EACN,CAAC,GAAG,EAAE,SAAS,CAAiB,EAChB,EAAE;;IAClB,CAAC,MAAA,MAAA,SAAS,CAAC,GAAG,CAAC,UAAU,0CAAE,MAAM,CAAC,IAAI,mCAAI,OAAO,CAAC,IAAI,CAAC,CACtD,qBAAqB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAC1C,CAAC;IAEF,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;QACpC,MAAM,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;KAC/B;SAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACzC,MAAM,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;KAC/B;SAAM;QACN,MAAM,IAAI,cAAc,CAAC,2BAA2B,OAAO,SAAS,EAAE,CAAC,CAAC;KACxE;AACF,CAAC,CAAC;AAEW,QAAA,MAAM,GAAW;IAC7B,MAAM,EAAE;QACP;YACC,SAAS,EAAE,YAAY;YACvB,OAAO,EAAE,YAAY;YACrB,SAAS;YACT,UAAU,EAAE;gBACX,oBAAoB,EAAE;;;KAGrB;gBACD,oBAAoB,EAAE;;;KAGrB;aACD;SACD;KACD;CACD,CAAC"}

package/src/migrator/migrator.ts

@@ -1,278 +0,0 @@
-import type { Tx } from '../database-layer/db';
-import type { Resolvable } from '../sbvr-api/common-types';
-import type { Config, Model } from '../config-loader/config-loader';
-
-import { Engines } from '@balena/abstract-sql-compiler';
-import * as _ from 'lodash';
-import { TypedError } from 'typed-error';
-import { migrator as migratorEnv } from '../config-loader/env';
-import * as sbvrUtils from '../sbvr-api/sbvr-utils';
-import { delay } from '../sbvr-api/control-flow';
-
-// tslint:disable-next-line:no-var-requires
-const modelText: string = require('./migrations.sbvr');
-
-type ApiRootModel = Model & { apiRoot: string };
-
-type SbvrUtils = typeof sbvrUtils;
-
-type MigrationTuple = [string, Migration];
-
-export type MigrationFn = (tx: Tx, sbvrUtils: SbvrUtils) => Resolvable<void>;
-
-export type Migration = string | MigrationFn;
-
-export class MigrationError extends TypedError {}
-
-// Tagged template to convert binds from `?` format to the necessary output format,
-// eg `$1`/`$2`/etc for postgres
-const binds = (strings: TemplateStringsArray, ...bindNums: number[]) =>
-	strings
-		.map((str, i) => {
-			if (i === bindNums.length) {
-				return str;
-			}
-			if (i + 1 !== bindNums[i]) {
-				throw new SyntaxError('Migration sql binds must be sequential');
-			}
-			if (sbvrUtils.db.engine === Engines.postgres) {
-				return str + `$${bindNums[i]}`;
-			}
-			return str + `?`;
-		})
-		.join('');
-
-export const postRun = async (tx: Tx, model: ApiRootModel): Promise<void> => {
-	const { initSql } = model;
-	if (initSql == null) {
-		return;
-	}
-
-	const modelName = model.apiRoot;
-
-	const exists = await checkModelAlreadyExists(tx, modelName);
-	if (!exists) {
-		(sbvrUtils.api.migrations?.logger.info ?? console.info)(
-			'First time executing, running init script',
-		);
-		await lockMigrations(tx, modelName, async () => {
-			await tx.executeSql(initSql);
-		});
-	}
-};
-
-export const run = async (tx: Tx, model: ApiRootModel): Promise<void> => {
-	const { migrations } = model;
-	if (migrations == null || _.isEmpty(migrations)) {
-		return;
-	}
-
-	const modelName = model.apiRoot;
-
-	// migrations only run if the model has been executed before,
-	// to make changes that can't be automatically applied
-	const exists = await checkModelAlreadyExists(tx, modelName);
-	if (!exists) {
-		(sbvrUtils.api.migrations?.logger.info ?? console.info)(
-			'First time model has executed, skipping migrations',
-		);
-
-		return await setExecutedMigrations(tx, modelName, Object.keys(migrations));
-	}
-	await lockMigrations(tx, modelName, async () => {
-		const executedMigrations = await getExecutedMigrations(tx, modelName);
-		const pendingMigrations = filterAndSortPendingMigrations(
-			migrations,
-			executedMigrations,
-		);
-		if (pendingMigrations.length === 0) {
-			return;
-		}
-
-		const newlyExecutedMigrations = await executeMigrations(
-			tx,
-			pendingMigrations,
-		);
-		await setExecutedMigrations(tx, modelName, [
-			...executedMigrations,
-			...newlyExecutedMigrations,
-		]);
-	});
-};
-
-const checkModelAlreadyExists = async (
-	tx: Tx,
-	modelName: string,
-): Promise<boolean> => {
-	const result = await tx.tableList("name = 'migration'");
-	if (result.rows.length === 0) {
-		return false;
-	}
-	const { rows } = await tx.executeSql(
-		binds`
-SELECT 1
-FROM "model"
-WHERE "model"."is of-vocabulary" = ${1}
-LIMIT 1`,
-		[modelName],
-	);
-
-	return rows.length > 0;
-};
-
-const getExecutedMigrations = async (
-	tx: Tx,
-	modelName: string,
-): Promise<string[]> => {
-	const { rows } = await tx.executeSql(
-		binds`
-SELECT "migration"."executed migrations" AS "executed_migrations"
-FROM "migration"
-WHERE "migration"."model name" = ${1}`,
-		[modelName],
-	);
-
-	const data = rows[0];
-	if (data == null) {
-		return [];
-	}
-
-	return JSON.parse(data.executed_migrations) as string[];
-};
-
-const setExecutedMigrations = async (
-	tx: Tx,
-	modelName: string,
-	executedMigrations: string[],
-): Promise<void> => {
-	const stringifiedMigrations = JSON.stringify(executedMigrations);
-
-	const result = await tx.tableList("name = 'migration'");
-	if (result.rows.length === 0) {
-		return;
-	}
-
-	const { rowsAffected } = await tx.executeSql(
-		binds`
-UPDATE "migration"
-SET "model name" = ${1},
-"executed migrations" = ${2}
-WHERE "migration"."model name" = ${3}`,
-		[modelName, stringifiedMigrations, modelName],
-	);
-
-	if (rowsAffected === 0) {
-		await tx.executeSql(
-			binds`
-INSERT INTO "migration" ("model name", "executed migrations")
-VALUES (${1}, ${2})`,
-			[modelName, stringifiedMigrations],
-		);
-	}
-};
-
-// turns {"key1": migration, "key3": migration, "key2": migration}
-// into  [["key1", migration], ["key2", migration], ["key3", migration]]
-const filterAndSortPendingMigrations = (
-	migrations: NonNullable<Model['migrations']>,
-	executedMigrations: string[],
-): MigrationTuple[] =>
-	(_(migrations).omit(executedMigrations) as _.Object<typeof migrations>)
-		.toPairs()
-		.sortBy(([migrationKey]) => migrationKey)
-		.value();
-
-const lockMigrations = async <T>(
-	tx: Tx,
-	modelName: string,
-	fn: () => Promise<T>,
-): Promise<T> => {
-	try {
-		await tx.executeSql(
-			binds`
-DELETE FROM "migration lock"
-WHERE "model name" = ${1}
-AND "created at" < ${2}`,
-			[modelName, new Date(Date.now() - migratorEnv.lockTimeout)],
-		);
-		await tx.executeSql(
-			binds`
-INSERT INTO "migration lock" ("model name")
-VALUES (${1})`,
-			[modelName],
-		);
-	} catch (err) {
-		await delay(migratorEnv.lockFailDelay);
-		throw err;
-	}
-	try {
-		return await fn();
-	} finally {
-		try {
-			await tx.executeSql(
-				binds`
-DELETE FROM "migration lock"
-WHERE "model name" = ${1}`,
-				[modelName],
-			);
-		} catch {
-			// We ignore errors here as it's mostly likely caused by the migration failing and
-			// rolling back the transaction, and if we rethrow here we'll overwrite the real error
-			// making it much harder for users to see what went wrong and fix it
-		}
-	}
-};
-
-const executeMigrations = async (
-	tx: Tx,
-	migrations: MigrationTuple[] = [],
-): Promise<string[]> => {
-	try {
-		for (const migration of migrations) {
-			await executeMigration(tx, migration);
-		}
-	} catch (err) {
-		(sbvrUtils.api.migrations?.logger.error ?? console.error)(
-			'Error while executing migrations, rolled back',
-		);
-		throw new MigrationError(err);
-	}
-	return migrations.map(([migrationKey]) => migrationKey); // return migration keys
-};
-
-const executeMigration = async (
-	tx: Tx,
-	[key, migration]: MigrationTuple,
-): Promise<void> => {
-	(sbvrUtils.api.migrations?.logger.info ?? console.info)(
-		`Running migration ${JSON.stringify(key)}`,
-	);
-
-	if (typeof migration === 'function') {
-		await migration(tx, sbvrUtils);
-	} else if (typeof migration === 'string') {
-		await tx.executeSql(migration);
-	} else {
-		throw new MigrationError(`Invalid migration type: ${typeof migration}`);
-	}
-};
-
-export const config: Config = {
-	models: [
-		{
-			modelName: 'migrations',
-			apiRoot: 'migrations',
-			modelText,
-			migrations: {
-				'11.0.0-modified-at': `
-					ALTER TABLE "migration"
-					ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
-				`,
-				'11.0.1-modified-at': `
-					ALTER TABLE "migration lock"
-					ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
-				`,
-			},
-		},
-	],
-};