@balena/pinejs 17.1.6-build-fix-sbvr-server-typings-a6832639037e7c8553c377798bb25652806c3031-1 → 17.1.6-build-migraates-sbvr-server-to-ts-ed2267c4b4cbe448b6062263b90a97492176663c-2

package/.versionbot/CHANGELOG.yml

@@ -1,6 +1,6 @@
 - commits:
-    - subject: Fix sbvr server typings
-      hash: a6832639037e7c8553c377798bb25652806c3031
+    - subject: Migrate sbvr-server to typescript
+      hash: ed2267c4b4cbe448b6062263b90a97492176663c
       body: ""
       footer:
         Change-type: patch
@@ -9,7 +9,7 @@
       nested: []
   version: 17.1.6
   title: ""
-  date: 2024-06-25T22:14:18.206Z
+  date: 2024-06-25T22:13:54.270Z
 - commits:
     - subject: Rollback sbvr-types back to v7
       hash: b61ee61f7b7318b0dd4269646d0272be820e806b

package/CHANGELOG.md

@@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 # v17.1.6
 ## (2024-06-25)
 
-* Fix sbvr server typings [Otavio Jacobi]
+* Migrate sbvr-server to typescript [Otavio Jacobi]
 
 # v17.1.5
 ## (2024-06-24)

package/out/data-server/sbvr-server.d.ts

@@ -1,2 +1,3 @@
-export function setup(app: import("express").Application, sbvrUtilsInstance: typeof import("../sbvr-api/sbvr-utils"), db: import("../database-layer/db").Database): import("../sbvr-api/common-types").Resolvable<void>;
-export const config: import("../config-loader/config-loader").Config;
+import type { Config, SetupFunction } from '../config-loader/config-loader';
+export declare const setup: SetupFunction;
+export declare const config: Config;

package/out/data-server/sbvr-server.js

@@ -1,5 +1,30 @@
-import * as permissions from '../sbvr-api/permissions';
-
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = exports.setup = void 0;
+const permissions = __importStar(require("../sbvr-api/permissions"));
 const uiModel = `\
 Vocabulary: ui
 
@@ -16,400 +41,337 @@ Fact type:  textarea has name
 	Necessity: Each name is of exactly 1 textarea
 Fact type:  textarea has text
 	Necessity: Each textarea has exactly 1 text`;
-
-// Middleware
 const isServerOnAir = (() => {
-	/** @type { ((thenableOrResult?: import('../sbvr-api/common-types').Resolvable<boolean>) => void) | undefined } */
-	let resolve;
-	let promise = new Promise(($resolve) => {
-		resolve = $resolve;
-	});
-	return (/** @type {boolean} */ value) => {
-		if (value != null) {
-			if (resolve != null) {
-				resolve(value);
-				resolve = undefined;
-			} else {
-				promise = Promise.resolve(value);
-			}
-		}
-		return promise;
-	};
+    let resolve;
+    let promise = new Promise(($resolve) => {
+        resolve = $resolve;
+    });
+    return (value) => {
+        if (value != null) {
+            if (resolve != null) {
+                resolve(value);
+                resolve = undefined;
+            }
+            else {
+                promise = Promise.resolve(value);
+            }
+        }
+        return promise;
+    };
 })();
-
-/** @type { import('express').Handler } */
 const serverIsOnAir = async (_req, _res, next) => {
-	const onAir = await isServerOnAir();
-	if (onAir) {
-		next();
-	} else {
-		next('route');
-	}
+    const onAir = await isServerOnAir();
+    if (onAir) {
+        next();
+    }
+    else {
+        next('route');
+    }
 };
-
-/** @type {import('../config-loader/config-loader').Config} */
-export const config = {
-	models: [
-		{
-			modelName: 'ui',
-			modelText: uiModel,
-			apiRoot: 'ui',
-			customServerCode: { setup },
-			migrations: {
-				'11.0.0-modified-at': `\
+const setup = async (app, sbvrUtils, db) => {
+    const uiApi = sbvrUtils.api.ui;
+    const devApi = sbvrUtils.api.dev;
+    const setupModels = async (tx) => {
+        try {
+            const uiApiTx = uiApi.clone({
+                passthrough: {
+                    tx,
+                    req: permissions.root,
+                },
+            });
+            await uiApiTx
+                .get({
+                resource: 'textarea',
+                id: {
+                    name: 'model_area',
+                },
+                options: {
+                    $select: 'id',
+                },
+            })
+                .then(async (result) => {
+                if (result == null) {
+                    return await uiApiTx.post({
+                        resource: 'textarea',
+                        body: {
+                            name: 'model_area',
+                            text: ' ',
+                        },
+                    });
+                }
+            });
+            await devApi
+                .get({
+                resource: 'model',
+                passthrough: {
+                    tx,
+                    req: permissions.rootRead,
+                },
+                options: {
+                    $select: ['is_of__vocabulary', 'model_value'],
+                    $filter: {
+                        model_type: 'se',
+                        is_of__vocabulary: 'data',
+                    },
+                },
+            })
+                .then(async (result) => {
+                if (result.length === 0) {
+                    throw new Error('No SE data model found');
+                }
+                const instance = result[0];
+                const modelValue = instance.model_value;
+                await sbvrUtils.executeModel(tx, {
+                    apiRoot: instance.is_of__vocabulary,
+                    modelText: modelValue.value,
+                });
+            });
+            await isServerOnAir(true);
+        }
+        catch {
+            await isServerOnAir(false);
+        }
+    };
+    app.get('/onAir', async (_req, res) => {
+        const onAir = await isServerOnAir();
+        res.json(onAir);
+    });
+    app.post('/update', permissions.checkPermissionsMiddleware('all'), serverIsOnAir, (_req, res) => {
+        res.status(404).end();
+    });
+    app.post('/execute', permissions.checkPermissionsMiddleware('all'), async (_req, res) => {
+        try {
+            await uiApi
+                .get({
+                resource: 'textarea',
+                passthrough: { req: permissions.rootRead },
+                id: {
+                    name: 'model_area',
+                },
+                options: {
+                    $select: 'text',
+                },
+            })
+                .then(async (result) => {
+                if (result == null) {
+                    throw new Error('Could not find the model to execute');
+                }
+                const modelText = result.text;
+                await db.transaction(async (tx) => {
+                    await sbvrUtils.executeModel(tx, {
+                        apiRoot: 'data',
+                        modelText,
+                    });
+                    await uiApi.patch({
+                        resource: 'textarea',
+                        passthrough: {
+                            tx,
+                            req: permissions.root,
+                        },
+                        id: {
+                            name: 'model_area',
+                        },
+                        body: {
+                            is_disabled: true,
+                        },
+                    });
+                });
+            });
+            await isServerOnAir(true);
+            res.status(200).end();
+        }
+        catch (err) {
+            await isServerOnAir(false);
+            res.status(404).json(err);
+        }
+    });
+    app.post('/validate', permissions.checkPermissionsMiddleware('read'), async (req, res) => {
+        try {
+            const results = await sbvrUtils.runRule('data', req.body.rule);
+            res.json(results);
+        }
+        catch (err) {
+            console.log('Error validating', err);
+            res.status(404).end();
+        }
+    });
+    app.delete('/cleardb', permissions.checkPermissionsMiddleware('delete'), async (_req, res) => {
+        try {
+            await db.transaction(async (tx) => {
+                const result = await tx.tableList();
+                await Promise.all(result.rows.map((table) => tx.dropTable(table.name)));
+                await sbvrUtils.executeStandardModels(tx);
+                console.warn('DEL /cleardb is very destructive and should really be followed by a full restart/reload.');
+                await sbvrUtils.executeModels(tx, exports.config.models);
+                await setupModels(tx);
+            });
+            res.status(200).end();
+        }
+        catch (err) {
+            console.error('Error clearing db', err);
+            res.status(503).end();
+        }
+    });
+    app.put('/importdb', permissions.checkPermissionsMiddleware({
+        and: ['create', 'update', 'delete'],
+    }), async (req, res) => {
+        try {
+            const queries = req.body.split(';');
+            await db.transaction(async (tx) => {
+                for (let query of queries) {
+                    query = query.trim();
+                    if (query.length > 0) {
+                        try {
+                            await tx.executeSql(query);
+                        }
+                        catch (err) {
+                            throw [query, err];
+                        }
+                    }
+                }
+            });
+            res.status(200).end();
+        }
+        catch (err) {
+            console.error('Error importing db', err);
+            res.status(404).end();
+        }
+    });
+    app.get('/exportdb', permissions.checkPermissionsMiddleware('read'), async (_req, res) => {
+        try {
+            let exported = '';
+            await db.transaction(async (tx) => {
+                const tables = await tx.tableList("name NOT LIKE '%_buk'");
+                await Promise.all(tables.rows.map(async (table) => {
+                    const tableName = table.name;
+                    exported += 'DROP TABLE IF EXISTS "' + tableName + '";\n';
+                    exported += table.sql + ';\n';
+                    const result = await tx.executeSql('SELECT * FROM "' + tableName + '";');
+                    let insQuery = '';
+                    for (const currRow of result.rows) {
+                        let notFirst = false;
+                        insQuery += 'INSERT INTO "' + tableName + '" (';
+                        let valQuery = '';
+                        for (const propName of Object.keys(currRow)) {
+                            if (notFirst) {
+                                insQuery += ',';
+                                valQuery += ',';
+                            }
+                            else {
+                                notFirst = true;
+                            }
+                            insQuery += '"' + propName + '"';
+                            valQuery += "'" + currRow[propName] + "'";
+                        }
+                        insQuery += ') values (' + valQuery + ');\n';
+                    }
+                    exported += insQuery;
+                }));
+            });
+            res.json(exported);
+        }
+        catch (err) {
+            console.error('Error exporting db', err);
+            res.status(503).end();
+        }
+    });
+    app.post('/backupdb', permissions.checkPermissionsMiddleware('all'), serverIsOnAir, async (_req, res) => {
+        try {
+            await db.transaction(async (tx) => {
+                const result = await tx.tableList("name NOT LIKE '%_buk'");
+                await Promise.all(result.rows.map(async (currRow) => {
+                    const tableName = currRow.name;
+                    await tx.dropTable(tableName + '_buk', true);
+                    await tx.executeSql('ALTER TABLE "' +
+                        tableName +
+                        '" RENAME TO "' +
+                        tableName +
+                        '_buk";');
+                }));
+            });
+            res.status(200).end();
+        }
+        catch (err) {
+            console.error('Error backing up db', err);
+            res.status(404).end();
+        }
+    });
+    app.post('/restoredb', permissions.checkPermissionsMiddleware('all'), serverIsOnAir, async (_req, res) => {
+        try {
+            await db.transaction(async (tx) => {
+                const result = await tx.tableList("name LIKE '%_buk'");
+                await Promise.all(result.rows.map(async (currRow) => {
+                    const tableName = currRow.name;
+                    await tx.dropTable(tableName.slice(0, -4), true);
+                    await tx.executeSql('ALTER TABLE "' +
+                        tableName +
+                        '" RENAME TO "' +
+                        tableName.slice(0, -4) +
+                        '";');
+                }));
+            });
+            res.status(200).end();
+        }
+        catch (err) {
+            console.error('Error restoring db', err);
+            res.status(404).end();
+        }
+    });
+    app.all('/data/*', serverIsOnAir, sbvrUtils.handleODataRequest);
+    app.get('/Auth/*', serverIsOnAir, sbvrUtils.handleODataRequest);
+    app.merge('/ui/*', sbvrUtils.handleODataRequest);
+    app.patch('/ui/*', sbvrUtils.handleODataRequest);
+    app.delete('/', serverIsOnAir, async (_req, res) => {
+        await Promise.all([
+            uiApi.patch({
+                resource: 'textarea',
+                passthrough: { req: permissions.root },
+                id: {
+                    name: 'model_area',
+                },
+                body: {
+                    text: '',
+                    is_disabled: false,
+                },
+            }),
+            sbvrUtils.deleteModel('data'),
+        ]);
+        await isServerOnAir(false);
+        res.status(200).end();
+    });
+    await db.transaction(setupModels);
+};
+exports.setup = setup;
+exports.config = {
+    models: [
+        {
+            modelName: 'ui',
+            modelText: uiModel,
+            apiRoot: 'ui',
+            customServerCode: { setup: exports.setup },
+            migrations: {
+                '11.0.0-modified-at': `\
 ALTER TABLE "textarea"
 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(`\
+                '15.0.0-data-types': async (tx, sbvrUtils) => {
+                    switch (sbvrUtils.db.engine) {
+                        case 'mysql':
+                            await tx.executeSql(`\
 								ALTER TABLE "textarea"
 								MODIFY "is disabled" BOOLEAN NOT NULL;`);
-							break;
-						case 'postgres':
-							await tx.executeSql(`\
+                            break;
+                        case 'postgres':
+                            await tx.executeSql(`\
 								ALTER TABLE "textarea"
 								ALTER COLUMN "is disabled" DROP DEFAULT,
 								ALTER COLUMN "is disabled" SET DATA TYPE BOOLEAN USING "is disabled"::BOOLEAN,
 								ALTER COLUMN "is disabled" SET DEFAULT FALSE;`);
-							break;
-						// No need to migrate for websql
-					}
-				},
-			},
-		},
-	],
+                            break;
+                    }
+                },
+            },
+        },
+    ],
 };
-
-/** @type { import('../config-loader/config-loader').SetupFunction } */
-export async function setup(app, sbvrUtils, db) {
-	const uiApi = sbvrUtils.api.ui;
-	const devApi = sbvrUtils.api.dev;
-	const setupModels = async (
-		/** @type { import('../database-layer/db').Tx } */ tx,
-	) => {
-		try {
-			const uiApiTx = uiApi.clone({
-				passthrough: {
-					tx,
-					req: permissions.root,
-				},
-			});
-			await uiApiTx
-				.get({
-					resource: 'textarea',
-					id: {
-						name: 'model_area',
-					},
-					options: {
-						$select: 'id',
-					},
-				})
-				.then(async (/** @type { { [key: string]: any } } */ result) => {
-					if (result == null) {
-						// Add a model_area entry if it doesn't already exist.
-						return await uiApiTx.post({
-							resource: 'textarea',
-							body: {
-								name: 'model_area',
-								text: ' ',
-							},
-						});
-					}
-				});
-			await devApi
-				.get({
-					resource: 'model',
-					passthrough: {
-						tx,
-						req: permissions.rootRead,
-					},
-					options: {
-						$select: ['is_of__vocabulary', 'model_value'],
-						$filter: {
-							model_type: 'se',
-							is_of__vocabulary: 'data',
-						},
-					},
-				})
-				.then(async (result) => {
-					if (result.length === 0) {
-						throw new Error('No SE data model found');
-					}
-					const instance = result[0];
-					// prettier-ignore
-					const modelValue = /** @type { {[key: string]: string} } */ (instance.model_value);
-					await sbvrUtils.executeModel(tx, {
-						apiRoot: instance.is_of__vocabulary,
-						modelText: modelValue.value,
-					});
-				});
-			await isServerOnAir(true);
-		} catch {
-			await isServerOnAir(false);
-		}
-	};
-
-	app.get('/onAir', async (_req, res) => {
-		const onAir = await isServerOnAir();
-		res.json(onAir);
-	});
-
-	app.post(
-		'/update',
-		permissions.checkPermissionsMiddleware('all'),
-		serverIsOnAir,
-		(_req, res) => {
-			res.status(404).end();
-		},
-	);
-
-	app.post(
-		'/execute',
-		permissions.checkPermissionsMiddleware('all'),
-		async (_req, res) => {
-			try {
-				await uiApi
-					.get({
-						resource: 'textarea',
-						passthrough: { req: permissions.rootRead },
-						id: {
-							name: 'model_area',
-						},
-						options: {
-							$select: 'text',
-						},
-					})
-					.then(async (/** @type { { [key: string]: any } } */ result) => {
-						if (result == null) {
-							throw new Error('Could not find the model to execute');
-						}
-						const modelText = result.text;
-						await db.transaction(async (tx) => {
-							await sbvrUtils.executeModel(tx, {
-								apiRoot: 'data',
-								modelText,
-							});
-							await uiApi.patch({
-								resource: 'textarea',
-								passthrough: {
-									tx,
-									req: permissions.root,
-								},
-								id: {
-									name: 'model_area',
-								},
-								body: {
-									is_disabled: true,
-								},
-							});
-						});
-					});
-				await isServerOnAir(true);
-				res.status(200).end();
-			} catch (err) {
-				await isServerOnAir(false);
-				res.status(404).json(err);
-			}
-		},
-	);
-	app.post(
-		'/validate',
-		permissions.checkPermissionsMiddleware('read'),
-		async (req, res) => {
-			try {
-				const results = await sbvrUtils.runRule('data', req.body.rule);
-				res.json(results);
-			} catch (err) {
-				console.log('Error validating', err);
-				res.status(404).end();
-			}
-		},
-	);
-	app.delete(
-		'/cleardb',
-		permissions.checkPermissionsMiddleware('delete'),
-		async (_req, res) => {
-			try {
-				await db.transaction(async (tx) => {
-					const result = await tx.tableList();
-
-					await Promise.all(
-						result.rows.map((table) => tx.dropTable(table.name)),
-					);
-					await sbvrUtils.executeStandardModels(tx);
-					// TODO: HACK: This is usually done by config-loader and should be done there
-					// In general cleardb is very destructive and should really go through a full "reboot" procedure to set everything up again.
-					console.warn(
-						'DEL /cleardb is very destructive and should really be followed by a full restart/reload.',
-					);
-					await sbvrUtils.executeModels(tx, exports.config.models);
-					await setupModels(tx);
-				});
-				res.status(200).end();
-			} catch (/** @type any */ err) {
-				console.error('Error clearing db', err);
-				res.status(503).end();
-			}
-		},
-	);
-	app.put(
-		'/importdb',
-		permissions.checkPermissionsMiddleware({
-			and: ['create', 'update', 'delete'],
-		}),
-		async (req, res) => {
-			try {
-				const queries = req.body.split(';');
-				await db.transaction(async (tx) => {
-					for (let query of queries) {
-						query = query.trim();
-						if (query.length > 0) {
-							try {
-								await tx.executeSql(query);
-							} catch (err) {
-								// TODO: Consider changing this to a custom Error
-								// eslint-disable-next-line no-throw-literal
-								throw [query, err];
-							}
-						}
-					}
-				});
-				res.status(200).end();
-			} catch (/** @type any */ err) {
-				console.error('Error importing db', err);
-				res.status(404).end();
-			}
-		},
-	);
-	app.get(
-		'/exportdb',
-		permissions.checkPermissionsMiddleware('read'),
-		async (_req, res) => {
-			try {
-				let exported = '';
-				await db.transaction(async (tx) => {
-					const tables = await tx.tableList("name NOT LIKE '%_buk'");
-					await Promise.all(
-						tables.rows.map(async (table) => {
-							const tableName = table.name;
-							exported += 'DROP TABLE IF EXISTS "' + tableName + '";\n';
-							exported += table.sql + ';\n';
-							const result = await tx.executeSql(
-								'SELECT * FROM "' + tableName + '";',
-							);
-							let insQuery = '';
-							for (const currRow of result.rows) {
-								let notFirst = false;
-								insQuery += 'INSERT INTO "' + tableName + '" (';
-								let valQuery = '';
-								for (const propName of Object.keys(currRow)) {
-									if (notFirst) {
-										insQuery += ',';
-										valQuery += ',';
-									} else {
-										notFirst = true;
-									}
-									insQuery += '"' + propName + '"';
-									valQuery += "'" + currRow[propName] + "'";
-								}
-								insQuery += ') values (' + valQuery + ');\n';
-							}
-							exported += insQuery;
-						}),
-					);
-				});
-				res.json(exported);
-			} catch (/** @type any */ err) {
-				console.error('Error exporting db', err);
-				res.status(503).end();
-			}
-		},
-	);
-	app.post(
-		'/backupdb',
-		permissions.checkPermissionsMiddleware('all'),
-		serverIsOnAir,
-		async (_req, res) => {
-			try {
-				await db.transaction(async (tx) => {
-					const result = await tx.tableList("name NOT LIKE '%_buk'");
-					await Promise.all(
-						result.rows.map(async (currRow) => {
-							const tableName = currRow.name;
-							await tx.dropTable(tableName + '_buk', true);
-
-							await tx.executeSql(
-								'ALTER TABLE "' +
-									tableName +
-									'" RENAME TO "' +
-									tableName +
-									'_buk";',
-							);
-						}),
-					);
-				});
-				res.status(200).end();
-			} catch (/** @type any */ err) {
-				console.error('Error backing up db', err);
-				res.status(404).end();
-			}
-		},
-	);
-	app.post(
-		'/restoredb',
-		permissions.checkPermissionsMiddleware('all'),
-		serverIsOnAir,
-		async (_req, res) => {
-			try {
-				await db.transaction(async (tx) => {
-					const result = await tx.tableList("name LIKE '%_buk'");
-					await Promise.all(
-						result.rows.map(async (currRow) => {
-							const tableName = currRow.name;
-							await tx.dropTable(tableName.slice(0, -4), true);
-							await tx.executeSql(
-								'ALTER TABLE "' +
-									tableName +
-									'" RENAME TO "' +
-									tableName.slice(0, -4) +
-									'";',
-							);
-						}),
-					);
-				});
-				res.status(200).end();
-			} catch (/** @type any */ err) {
-				console.error('Error restoring db', err);
-				res.status(404).end();
-			}
-		},
-	);
-
-	app.all('/data/*', serverIsOnAir, sbvrUtils.handleODataRequest);
-	app.get('/Auth/*', serverIsOnAir, sbvrUtils.handleODataRequest);
-	app.merge('/ui/*', sbvrUtils.handleODataRequest);
-	app.patch('/ui/*', sbvrUtils.handleODataRequest);
-
-	app.delete('/', serverIsOnAir, async (_req, res) => {
-		await Promise.all([
-			uiApi.patch({
-				resource: 'textarea',
-				passthrough: { req: permissions.root },
-				id: {
-					name: 'model_area',
-				},
-				body: {
-					text: '',
-					is_disabled: false,
-				},
-			}),
-			sbvrUtils.deleteModel('data'),
-		]);
-		await isServerOnAir(false);
-		res.status(200).end();
-	});
-
-	await db.transaction(setupModels);
-}
+//# sourceMappingURL=sbvr-server.js.map

package/out/data-server/sbvr-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"sbvr-server.js","sourceRoot":"","sources":["../../src/data-server/sbvr-server.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAqFA,sBAyUC;AA9ZD,qEAAuD;AAEvD,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;6CAe6B,CAAC;AAG9C,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;IAE3B,IAAI,OAAO,CAAC;IACZ,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACtC,OAAO,GAAG,QAAQ,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,OAAO,CAAwB,KAAK,EAAE,EAAE;QACvC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;gBACrB,OAAO,CAAC,KAAK,CAAC,CAAC;gBACf,OAAO,GAAG,SAAS,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACP,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACF,CAAC;QACD,OAAO,OAAO,CAAC;IAChB,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAGL,MAAM,aAAa,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAChD,MAAM,KAAK,GAAG,MAAM,aAAa,EAAE,CAAC;IACpC,IAAI,KAAK,EAAE,CAAC;QACX,IAAI,EAAE,CAAC;IACR,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,OAAO,CAAC,CAAC;IACf,CAAC;AACF,CAAC,CAAC;AAGW,QAAA,MAAM,GAAG;IACrB,MAAM,EAAE;QACP;YACC,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,IAAI;YACb,gBAAgB,EAAE,EAAE,KAAK,EAAE;YAC3B,UAAU,EAAE;gBACX,oBAAoB,EAAE;;;CAGzB;gBACG,mBAAmB,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;oBAC5C,QAAQ,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;wBAC7B,KAAK,OAAO;4BACX,MAAM,EAAE,CAAC,UAAU,CAAC;;+CAEoB,CAAC,CAAC;4BAC1C,MAAM;wBACP,KAAK,UAAU;4BACd,MAAM,EAAE,CAAC,UAAU,CAAC;;;;sDAI2B,CAAC,CAAC;4BACjD,MAAM;oBAER,CAAC;gBACF,CAAC;aACD;SACD;KACD;CACD,CAAC;AAGK,KAAK,UAAU,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;IAC7C,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;IACjC,MAAM,WAAW,GAAG,KAAK,EAC2B,EAAE,EACpD,EAAE;QACH,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC3B,WAAW,EAAE;oBACZ,EAAE;oBACF,GAAG,EAAE,WAAW,CAAC,IAAI;iBACrB;aACD,CAAC,CAAC;YACH,MAAM,OAAO;iBACX,GAAG,CAAC;gBACJ,QAAQ,EAAE,UAAU;gBACpB,EAAE,EAAE;oBACH,IAAI,EAAE,YAAY;iBAClB;gBACD,OAAO,EAAE;oBACR,OAAO,EAAE,IAAI;iBACb;aACD,CAAC;iBACD,IAAI,CAAC,KAAK,EAA0C,MAAM,EAAE,EAAE;gBAC9D,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBAEpB,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC;wBACzB,QAAQ,EAAE,UAAU;wBACpB,IAAI,EAAE;4BACL,IAAI,EAAE,YAAY;4BAClB,IAAI,EAAE,GAAG;yBACT;qBACD,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC,CAAC,CAAC;YACJ,MAAM,MAAM;iBACV,GAAG,CAAC;gBACJ,QAAQ,EAAE,OAAO;gBACjB,WAAW,EAAE;oBACZ,EAAE;oBACF,GAAG,EAAE,WAAW,CAAC,QAAQ;iBACzB;gBACD,OAAO,EAAE;oBACR,OAAO,EAAE,CAAC,mBAAmB,EAAE,aAAa,CAAC;oBAC7C,OAAO,EAAE;wBACR,UAAU,EAAE,IAAI;wBAChB,iBAAiB,EAAE,MAAM;qBACzB;iBACD;aACD,CAAC;iBACD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACtB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACzB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAC3C,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAE3B,MAAM,UAAU,GAA4C,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACnF,MAAM,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE;oBAChC,OAAO,EAAE,QAAQ,CAAC,iBAAiB;oBACnC,SAAS,EAAE,UAAU,CAAC,KAAK;iBAC3B,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACJ,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACR,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,MAAM,aAAa,EAAE,CAAC;QACpC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CACP,SAAS,EACT,WAAW,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAC7C,aAAa,EACb,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACb,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC,CACD,CAAC;IAEF,GAAG,CAAC,IAAI,CACP,UAAU,EACV,WAAW,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAC7C,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,MAAM,KAAK;iBACT,GAAG,CAAC;gBACJ,QAAQ,EAAE,UAAU;gBACpB,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,QAAQ,EAAE;gBAC1C,EAAE,EAAE;oBACH,IAAI,EAAE,YAAY;iBAClB;gBACD,OAAO,EAAE;oBACR,OAAO,EAAE,MAAM;iBACf;aACD,CAAC;iBACD,IAAI,CAAC,KAAK,EAA0C,MAAM,EAAE,EAAE;gBAC9D,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACxD,CAAC;gBACD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC;gBAC9B,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;oBACjC,MAAM,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE;wBAChC,OAAO,EAAE,MAAM;wBACf,SAAS;qBACT,CAAC,CAAC;oBACH,MAAM,KAAK,CAAC,KAAK,CAAC;wBACjB,QAAQ,EAAE,UAAU;wBACpB,WAAW,EAAE;4BACZ,EAAE;4BACF,GAAG,EAAE,WAAW,CAAC,IAAI;yBACrB;wBACD,EAAE,EAAE;4BACH,IAAI,EAAE,YAAY;yBAClB;wBACD,IAAI,EAAE;4BACL,WAAW,EAAE,IAAI;yBACjB;qBACD,CAAC,CAAC;gBACJ,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACJ,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;YAC1B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;YAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,IAAI,CACP,WAAW,EACX,WAAW,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAC9C,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClB,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/D,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;YACrC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,MAAM,CACT,UAAU,EACV,WAAW,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAChD,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC;gBAEpC,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CACpD,CAAC;gBACF,MAAM,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;gBAG1C,OAAO,CAAC,IAAI,CACX,0FAA0F,CAC1F,CAAC;gBACF,MAAM,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACzD,MAAM,WAAW,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;YACxC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,GAAG,CACN,WAAW,EACX,WAAW,CAAC,0BAA0B,CAAC;QACtC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;KACnC,CAAC,EACF,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClB,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC3B,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;oBACrB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACtB,IAAI,CAAC;4BACJ,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;wBAC5B,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BAGd,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;wBACpB,CAAC;oBACF,CAAC;gBACF,CAAC;YACF,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;YACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,GAAG,CACN,WAAW,EACX,WAAW,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAC9C,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;gBAC3D,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAC/B,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;oBAC7B,QAAQ,IAAI,wBAAwB,GAAG,SAAS,GAAG,MAAM,CAAC;oBAC1D,QAAQ,IAAI,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC;oBAC9B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,UAAU,CACjC,iBAAiB,GAAG,SAAS,GAAG,IAAI,CACpC,CAAC;oBACF,IAAI,QAAQ,GAAG,EAAE,CAAC;oBAClB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;wBACnC,IAAI,QAAQ,GAAG,KAAK,CAAC;wBACrB,QAAQ,IAAI,eAAe,GAAG,SAAS,GAAG,KAAK,CAAC;wBAChD,IAAI,QAAQ,GAAG,EAAE,CAAC;wBAClB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;4BAC7C,IAAI,QAAQ,EAAE,CAAC;gCACd,QAAQ,IAAI,GAAG,CAAC;gCAChB,QAAQ,IAAI,GAAG,CAAC;4BACjB,CAAC;iCAAM,CAAC;gCACP,QAAQ,GAAG,IAAI,CAAC;4BACjB,CAAC;4BACD,QAAQ,IAAI,GAAG,GAAG,QAAQ,GAAG,GAAG,CAAC;4BACjC,QAAQ,IAAI,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;wBAC3C,CAAC;wBACD,QAAQ,IAAI,YAAY,GAAG,QAAQ,GAAG,MAAM,CAAC;oBAC9C,CAAC;oBACD,QAAQ,IAAI,QAAQ,CAAC;gBACtB,CAAC,CAAC,CACF,CAAC;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;YACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,IAAI,CACP,WAAW,EACX,WAAW,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAC7C,aAAa,EACb,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;gBAC3D,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBACjC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;oBAC/B,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,GAAG,MAAM,EAAE,IAAI,CAAC,CAAC;oBAE7C,MAAM,EAAE,CAAC,UAAU,CAClB,eAAe;wBACd,SAAS;wBACT,eAAe;wBACf,SAAS;wBACT,QAAQ,CACT,CAAC;gBACH,CAAC,CAAC,CACF,CAAC;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;YAC1C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,IAAI,CACP,YAAY,EACZ,WAAW,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAC7C,aAAa,EACb,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;gBACvD,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBACjC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;oBAC/B,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;oBACjD,MAAM,EAAE,CAAC,UAAU,CAClB,eAAe;wBACd,SAAS;wBACT,eAAe;wBACf,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACtB,IAAI,CACL,CAAC;gBACH,CAAC,CAAC,CACF,CAAC;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;YACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAChE,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAChE,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACjD,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAEjD,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAClD,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,KAAK,CAAC,KAAK,CAAC;gBACX,QAAQ,EAAE,UAAU;gBACpB,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,EAAE;gBACtC,EAAE,EAAE;oBACH,IAAI,EAAE,YAAY;iBAClB;gBACD,IAAI,EAAE;oBACL,IAAI,EAAE,EAAE;oBACR,WAAW,EAAE,KAAK;iBAClB;aACD,CAAC;YACF,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;SAC7B,CAAC,CAAC;QACH,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"file":"sbvr-server.js","sourceRoot":"","sources":["../../src/data-server/sbvr-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAAuD;AAMvD,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;6CAe6B,CAAC;AAG9C,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;IAC3B,IAAI,OAAuE,CAAC;IAC5E,IAAI,OAAO,GAAG,IAAI,OAAO,CAAU,CAAC,QAAQ,EAAE,EAAE;QAC/C,OAAO,GAAG,QAAQ,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,KAAe,EAAE,EAAE;QAC1B,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;gBACrB,OAAO,CAAC,KAAK,CAAC,CAAC;gBACf,OAAO,GAAG,SAAS,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACP,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACF,CAAC;QACD,OAAO,OAAO,CAAC;IAChB,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,MAAM,aAAa,GAAY,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IACzD,MAAM,KAAK,GAAG,MAAM,aAAa,EAAE,CAAC;IACpC,IAAI,KAAK,EAAE,CAAC;QACX,IAAI,EAAE,CAAC;IACR,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,OAAO,CAAC,CAAC;IACf,CAAC;AACF,CAAC,CAAC;AAEK,MAAM,KAAK,GAAkB,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE;IAChE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;IACjC,MAAM,WAAW,GAAG,KAAK,EAAE,EAAM,EAAE,EAAE;QACpC,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC3B,WAAW,EAAE;oBACZ,EAAE;oBACF,GAAG,EAAE,WAAW,CAAC,IAAI;iBACrB;aACD,CAAC,CAAC;YACH,MAAM,OAAO;iBACX,GAAG,CAAC;gBACJ,QAAQ,EAAE,UAAU;gBACpB,EAAE,EAAE;oBACH,IAAI,EAAE,YAAY;iBAClB;gBACD,OAAO,EAAE;oBACR,OAAO,EAAE,IAAI;iBACb;aACD,CAAC;iBACD,IAAI,CAAC,KAAK,EAA0C,MAAM,EAAE,EAAE;gBAC9D,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBAEpB,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC;wBACzB,QAAQ,EAAE,UAAU;wBACpB,IAAI,EAAE;4BACL,IAAI,EAAE,YAAY;4BAClB,IAAI,EAAE,GAAG;yBACT;qBACD,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC,CAAC,CAAC;YACJ,MAAM,MAAM;iBACV,GAAG,CAAC;gBACJ,QAAQ,EAAE,OAAO;gBACjB,WAAW,EAAE;oBACZ,EAAE;oBACF,GAAG,EAAE,WAAW,CAAC,QAAQ;iBACzB;gBACD,OAAO,EAAE;oBACR,OAAO,EAAE,CAAC,mBAAmB,EAAE,aAAa,CAAC;oBAC7C,OAAO,EAAE;wBACR,UAAU,EAAE,IAAI;wBAChB,iBAAiB,EAAE,MAAM;qBACzB;iBACD;aACD,CAAC;iBACD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACtB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACzB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAC3C,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC3B,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAwC,CAAC;gBACrE,MAAM,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE;oBAChC,OAAO,EAAE,QAAQ,CAAC,iBAAiB;oBACnC,SAAS,EAAE,UAAU,CAAC,KAAK;iBAC3B,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACJ,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACR,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,MAAM,aAAa,EAAE,CAAC;QACpC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CACP,SAAS,EACT,WAAW,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAC7C,aAAa,EACb,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACb,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC,CACD,CAAC;IAEF,GAAG,CAAC,IAAI,CACP,UAAU,EACV,WAAW,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAC7C,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,MAAM,KAAK;iBACT,GAAG,CAAC;gBACJ,QAAQ,EAAE,UAAU;gBACpB,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,QAAQ,EAAE;gBAC1C,EAAE,EAAE;oBACH,IAAI,EAAE,YAAY;iBAClB;gBACD,OAAO,EAAE;oBACR,OAAO,EAAE,MAAM;iBACf;aACD,CAAC;iBACD,IAAI,CAAC,KAAK,EAA0C,MAAM,EAAE,EAAE;gBAC9D,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACxD,CAAC;gBACD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC;gBAC9B,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;oBACjC,MAAM,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE;wBAChC,OAAO,EAAE,MAAM;wBACf,SAAS;qBACT,CAAC,CAAC;oBACH,MAAM,KAAK,CAAC,KAAK,CAAC;wBACjB,QAAQ,EAAE,UAAU;wBACpB,WAAW,EAAE;4BACZ,EAAE;4BACF,GAAG,EAAE,WAAW,CAAC,IAAI;yBACrB;wBACD,EAAE,EAAE;4BACH,IAAI,EAAE,YAAY;yBAClB;wBACD,IAAI,EAAE;4BACL,WAAW,EAAE,IAAI;yBACjB;qBACD,CAAC,CAAC;gBACJ,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACJ,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;YAC1B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;YAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,IAAI,CACP,WAAW,EACX,WAAW,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAC9C,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClB,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/D,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;YACrC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,MAAM,CACT,UAAU,EACV,WAAW,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAChD,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC;gBAEpC,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CACpD,CAAC;gBACF,MAAM,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;gBAG1C,OAAO,CAAC,IAAI,CACX,0FAA0F,CAC1F,CAAC;gBACF,MAAM,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACzD,MAAM,WAAW,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;YACxC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,GAAG,CACN,WAAW,EACX,WAAW,CAAC,0BAA0B,CAAC;QACtC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;KACnC,CAAC,EACF,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClB,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC3B,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;oBACrB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACtB,IAAI,CAAC;4BACJ,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;wBAC5B,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BAGd,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;wBACpB,CAAC;oBACF,CAAC;gBACF,CAAC;YACF,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;YACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,GAAG,CACN,WAAW,EACX,WAAW,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAC9C,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;gBAC3D,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAC/B,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;oBAC7B,QAAQ,IAAI,wBAAwB,GAAG,SAAS,GAAG,MAAM,CAAC;oBAC1D,QAAQ,IAAI,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC;oBAC9B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,UAAU,CACjC,iBAAiB,GAAG,SAAS,GAAG,IAAI,CACpC,CAAC;oBACF,IAAI,QAAQ,GAAG,EAAE,CAAC;oBAClB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;wBACnC,IAAI,QAAQ,GAAG,KAAK,CAAC;wBACrB,QAAQ,IAAI,eAAe,GAAG,SAAS,GAAG,KAAK,CAAC;wBAChD,IAAI,QAAQ,GAAG,EAAE,CAAC;wBAClB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;4BAC7C,IAAI,QAAQ,EAAE,CAAC;gCACd,QAAQ,IAAI,GAAG,CAAC;gCAChB,QAAQ,IAAI,GAAG,CAAC;4BACjB,CAAC;iCAAM,CAAC;gCACP,QAAQ,GAAG,IAAI,CAAC;4BACjB,CAAC;4BACD,QAAQ,IAAI,GAAG,GAAG,QAAQ,GAAG,GAAG,CAAC;4BACjC,QAAQ,IAAI,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;wBAC3C,CAAC;wBACD,QAAQ,IAAI,YAAY,GAAG,QAAQ,GAAG,MAAM,CAAC;oBAC9C,CAAC;oBACD,QAAQ,IAAI,QAAQ,CAAC;gBACtB,CAAC,CAAC,CACF,CAAC;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;YACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,IAAI,CACP,WAAW,EACX,WAAW,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAC7C,aAAa,EACb,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;gBAC3D,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBACjC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;oBAC/B,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,GAAG,MAAM,EAAE,IAAI,CAAC,CAAC;oBAE7C,MAAM,EAAE,CAAC,UAAU,CAClB,eAAe;wBACd,SAAS;wBACT,eAAe;wBACf,SAAS;wBACT,QAAQ,CACT,CAAC;gBACH,CAAC,CAAC,CACF,CAAC;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;YAC1C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IACF,GAAG,CAAC,IAAI,CACP,YAAY,EACZ,WAAW,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAC7C,aAAa,EACb,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;gBACvD,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBACjC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;oBAC/B,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;oBACjD,MAAM,EAAE,CAAC,UAAU,CAClB,eAAe;wBACd,SAAS;wBACT,eAAe;wBACf,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACtB,IAAI,CACL,CAAC;gBACH,CAAC,CAAC,CACF,CAAC;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QAAC,OAAwB,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;YACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;IACF,CAAC,CACD,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAChE,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAChE,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACjD,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAEjD,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAClD,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,KAAK,CAAC,KAAK,CAAC;gBACX,QAAQ,EAAE,UAAU;gBACpB,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,EAAE;gBACtC,EAAE,EAAE;oBACH,IAAI,EAAE,YAAY;iBAClB;gBACD,IAAI,EAAE;oBACL,IAAI,EAAE,EAAE;oBACR,WAAW,EAAE,KAAK;iBAClB;aACD,CAAC;YACF,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;SAC7B,CAAC,CAAC;QACH,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;AACnC,CAAC,CAAC;AAtUW,QAAA,KAAK,SAsUhB;AAEW,QAAA,MAAM,GAAW;IAC7B,MAAM,EAAE;QACP;YACC,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,IAAI;YACb,gBAAgB,EAAE,EAAE,KAAK,EAAL,aAAK,EAAE;YAC3B,UAAU,EAAE;gBACX,oBAAoB,EAAE;;;CAGzB;gBACG,mBAAmB,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;oBAC5C,QAAQ,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;wBAC7B,KAAK,OAAO;4BACX,MAAM,EAAE,CAAC,UAAU,CAAC;;+CAEoB,CAAC,CAAC;4BAC1C,MAAM;wBACP,KAAK,UAAU;4BACd,MAAM,EAAE,CAAC,UAAU,CAAC;;;;sDAI2B,CAAC,CAAC;4BACjD,MAAM;oBAER,CAAC;gBACF,CAAC;aACD;SACD;KACD;CACD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "17.1.6-build-fix-sbvr-server-typings-a6832639037e7c8553c377798bb25652806c3031-1",
+  "version": "17.1.6-build-migraates-sbvr-server-to-ts-ed2267c4b4cbe448b6062263b90a97492176663c-2",
   "main": "out/server-glue/module",
   "type": "commonjs",
   "repository": "git@github.com:balena-io/pinejs.git",
@@ -146,6 +146,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2024-06-25T22:14:18.935Z"
+    "publishedAt": "2024-06-25T22:13:55.001Z"
   }
 }

package/src/data-server/{sbvr-server.js → sbvr-server.ts}

@@ -1,4 +1,8 @@
 import * as permissions from '../sbvr-api/permissions';
+import type { Resolvable } from '../sbvr-api/common-types';
+import type { Handler } from 'express';
+import type { Config, SetupFunction } from '../config-loader/config-loader';
+import type { Tx } from '../database-layer/db';
 
 const uiModel = `\
 Vocabulary: ui
@@ -19,12 +23,11 @@ Fact type:  textarea has text
 
 // Middleware
 const isServerOnAir = (() => {
-	/** @type { ((thenableOrResult?: import('../sbvr-api/common-types').Resolvable<boolean>) => void) | undefined } */
-	let resolve;
-	let promise = new Promise(($resolve) => {
+	let resolve: ((thenableOrResult?: Resolvable<boolean>) => void) | undefined;
+	let promise = new Promise<boolean>(($resolve) => {
 		resolve = $resolve;
 	});
-	return (/** @type {boolean} */ value) => {
+	return (value?: boolean) => {
 		if (value != null) {
 			if (resolve != null) {
 				resolve(value);
@@ -37,8 +40,7 @@ const isServerOnAir = (() => {
 	};
 })();
 
-/** @type { import('express').Handler } */
-const serverIsOnAir = async (_req, _res, next) => {
+const serverIsOnAir: Handler = async (_req, _res, next) => {
 	const onAir = await isServerOnAir();
 	if (onAir) {
 		next();
@@ -47,48 +49,10 @@ const serverIsOnAir = async (_req, _res, next) => {
 	}
 };
 
-/** @type {import('../config-loader/config-loader').Config} */
-export const config = {
-	models: [
-		{
-			modelName: 'ui',
-			modelText: uiModel,
-			apiRoot: 'ui',
-			customServerCode: { setup },
-			migrations: {
-				'11.0.0-modified-at': `\
-ALTER TABLE "textarea"
-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 "textarea"
-								MODIFY "is disabled" BOOLEAN NOT NULL;`);
-							break;
-						case 'postgres':
-							await tx.executeSql(`\
-								ALTER TABLE "textarea"
-								ALTER COLUMN "is disabled" DROP DEFAULT,
-								ALTER COLUMN "is disabled" SET DATA TYPE BOOLEAN USING "is disabled"::BOOLEAN,
-								ALTER COLUMN "is disabled" SET DEFAULT FALSE;`);
-							break;
-						// No need to migrate for websql
-					}
-				},
-			},
-		},
-	],
-};
-
-/** @type { import('../config-loader/config-loader').SetupFunction } */
-export async function setup(app, sbvrUtils, db) {
+export const setup: SetupFunction = async (app, sbvrUtils, db) => {
 	const uiApi = sbvrUtils.api.ui;
 	const devApi = sbvrUtils.api.dev;
-	const setupModels = async (
-		/** @type { import('../database-layer/db').Tx } */ tx,
-	) => {
+	const setupModels = async (tx: Tx) => {
 		try {
 			const uiApiTx = uiApi.clone({
 				passthrough: {
@@ -138,8 +102,7 @@ export async function setup(app, sbvrUtils, db) {
 						throw new Error('No SE data model found');
 					}
 					const instance = result[0];
-					// prettier-ignore
-					const modelValue = /** @type { {[key: string]: string} } */ (instance.model_value);
+					const modelValue = instance.model_value as { [key: string]: string };
 					await sbvrUtils.executeModel(tx, {
 						apiRoot: instance.is_of__vocabulary,
 						modelText: modelValue.value,
@@ -412,4 +375,38 @@ export async function setup(app, sbvrUtils, db) {
 	});
 
 	await db.transaction(setupModels);
-}
+};
+
+export const config: Config = {
+	models: [
+		{
+			modelName: 'ui',
+			modelText: uiModel,
+			apiRoot: 'ui',
+			customServerCode: { setup },
+			migrations: {
+				'11.0.0-modified-at': `\
+ALTER TABLE "textarea"
+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 "textarea"
+								MODIFY "is disabled" BOOLEAN NOT NULL;`);
+							break;
+						case 'postgres':
+							await tx.executeSql(`\
+								ALTER TABLE "textarea"
+								ALTER COLUMN "is disabled" DROP DEFAULT,
+								ALTER COLUMN "is disabled" SET DATA TYPE BOOLEAN USING "is disabled"::BOOLEAN,
+								ALTER COLUMN "is disabled" SET DEFAULT FALSE;`);
+							break;
+						// No need to migrate for websql
+					}
+				},
+			},
+		},
+	],
+};