@balena/pinejs 17.1.0-build-joshbwlng-tasks-e8a81b1d884e0039e67661a25a5cb81d46966640-1 → 17.1.0-build-model-based-typings-86a981c89f828217571c93fa010174529a5345f9-1

package/out/sbvr-api/user.d.ts

@@ -0,0 +1,467 @@
+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;
+    user_role: UserHasRole;
+    user_permission: UserHasPermission;
+}

package/out/sbvr-api/user.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=user.js.map

package/out/sbvr-api/user.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/sbvr-api/user.ts"],"names":[],"mappings":""}

package/out/server-glue/module.d.ts

@@ -12,7 +12,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 };

package/out/server-glue/module.js

@@ -23,12 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.webResourceHandler = exports.tasks = exports.hooks = exports.types = exports.env = exports.errors = exports.permissions = exports.sbvrUtils = exports.mountLoginRouter = exports.PinejsSessionStore = exports.dbModule = void 0;
+exports.init = exports.webResourceHandler = exports.hooks = exports.types = exports.env = exports.errors = exports.permissions = exports.sbvrUtils = exports.mountLoginRouter = exports.PinejsSessionStore = exports.dbModule = void 0;
 require("./sbvr-loader");
 const dbModule = __importStar(require("../database-layer/db"));
 const configLoader = __importStar(require("../config-loader/config-loader"));
 const migrator = __importStar(require("../migrator/sync"));
-const tasks = __importStar(require("../tasks"));
 const sbvrUtils = __importStar(require("../sbvr-api/sbvr-utils"));
 const env_1 = require("../config-loader/env");
 exports.dbModule = __importStar(require("../database-layer/db"));
@@ -42,7 +41,6 @@ exports.errors = __importStar(require("../sbvr-api/errors"));
 exports.env = __importStar(require("../config-loader/env"));
 exports.types = __importStar(require("../sbvr-api/common-types"));
 exports.hooks = __importStar(require("../sbvr-api/hooks"));
-exports.tasks = __importStar(require("../tasks"));
 exports.webResourceHandler = __importStar(require("../webresource-handler"));
 let envDatabaseOptions;
 if (dbModule.engines.websql != null) {
@@ -77,7 +75,6 @@ const init = async (app, config, databaseOptions = envDatabaseOptions) => {
         await sbvrUtils.setup(app, db);
         const cfgLoader = await configLoader.setup(app);
         await cfgLoader.loadConfig(migrator.config);
-        await cfgLoader.loadConfig(tasks.config);
         const promises = [];
         if (process.env.SBVR_SERVER_ENABLED) {
             const sbvrServer = await import('../data-server/sbvr-server.js');

package/out/server-glue/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/server-glue/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/server-glue/module.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "17.1.0-build-joshbwlng-tasks-e8a81b1d884e0039e67661a25a5cb81d46966640-1",
+  "version": "17.1.0-build-model-based-typings-86a981c89f828217571c93fa010174529a5345f9-1",
   "main": "out/server-glue/module",
   "type": "commonjs",
   "repository": "git@github.com:balena-io/pinejs.git",
@@ -19,27 +19,29 @@
     "webpack-server": "grunt server",
     "webpack-build": "npm run webpack-browser && npm run webpack-module && npm run webpack-server",
     "lint": "balena-lint -t tsconfig.dev.json -e js -e ts src build typings Gruntfile.ts && npx tsc --project tsconfig.dev.json --noEmit",
-    "test": "npm run lint && npm run build && npm run webpack-build && npm run test:compose",
-    "test:compose": "trap 'docker compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' INT; docker compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres PINEJS_WEBRESOURCE_MAXFILESIZE=1000000000 S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD S3_STORAGE_ADAPTER_BUCKET=balena-pine-web-resources S3_REGION=us-east-1 PINEJS_QUEUE_CONCURRENCY=1 npm run mocha",
+    "test": "npm run lint && npm run build && npm run webpack-build && npm run test:compose && npm run test:generated-types",
+    "test:compose": "trap 'docker compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' INT; docker compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres PINEJS_WEBRESOURCE_MAXFILESIZE=1000000000 S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD S3_STORAGE_ADAPTER_BUCKET=balena-pine-web-resources S3_REGION=us-east-1 npm run mocha",
+    "test:generated-types": "npm run generate-types && git diff --exit-code ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts",
     "mocha": "TS_NODE_FILES=true mocha",
-    "prettify": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.ts"
+    "prettify": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.ts",
+    "generate-types": "node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/user.sbvr ./src/sbvr-api/user.ts && node ./bin/sbvr-compiler.js generate-types ./src/migrator/migrations.sbvr ./src/migrator/migrations.ts && node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/dev.sbvr ./src/sbvr-api/dev.ts && balena-lint -t tsconfig.dev.json --fix ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts"
   },
   "dependencies": {
-    "@balena/abstract-sql-compiler": "^9.1.4",
-    "@balena/abstract-sql-to-typescript": "^3.1.1",
+    "@balena/abstract-sql-compiler": "^9.2.0",
+    "@balena/abstract-sql-to-typescript": "^3.1.2",
     "@balena/env-parsing": "^1.1.12",
     "@balena/lf-to-abstract-sql": "^5.0.2",
     "@balena/odata-parser": "^3.0.8",
     "@balena/odata-to-abstract-sql": "^6.2.7",
     "@balena/sbvr-parser": "^1.4.4",
-    "@balena/sbvr-types": "^7.1.1",
+    "@balena/sbvr-types": "^7.1.3",
     "@types/body-parser": "^1.19.5",
     "@types/compression": "^1.7.5",
     "@types/cookie-parser": "^1.4.7",
     "@types/deep-freeze": "^0.1.5",
     "@types/express": "^4.17.21",
     "@types/express-session": "^1.18.0",
-    "@types/lodash": "^4.17.4",
+    "@types/lodash": "^4.17.5",
     "@types/memoizee": "^0.4.11",
     "@types/method-override": "^0.0.35",
     "@types/multer": "^1.4.11",
@@ -51,16 +53,14 @@
     "@types/pg": "^8.11.6",
     "@types/randomstring": "^1.3.0",
     "@types/websql": "^0.0.30",
-    "ajv": "^8.12.0",
     "busboy": "^1.6.0",
     "commander": "^11.1.0",
-    "cron-parser": "^4.9.0",
     "deep-freeze": "^0.0.1",
     "eventemitter3": "^5.0.1",
     "express-session": "^1.18.0",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.17",
-    "pinejs-client-core": "^6.14.6",
+    "pinejs-client-core": "^6.15.0",
     "randomstring": "^1.3.0",
     "typed-error": "^3.2.2"
   },
@@ -91,12 +91,11 @@
     "grunt-ts": "^6.0.0-beta.22",
     "grunt-webpack": "^6.0.0",
     "husky": "^9.0.11",
-    "json-schema-to-ts": "^3.1.0",
-    "lint-staged": "^15.2.5",
+    "lint-staged": "^15.2.7",
     "load-grunt-tasks": "^5.1.0",
     "mocha": "^10.4.0",
     "on-finished": "^2.4.1",
-    "pinejs-client-supertest": "^2.0.3",
+    "pinejs-client-supertest": "^2.0.4",
     "raw-loader": "^4.0.2",
     "request": "^2.88.2",
     "require-npm4-to-publish": "^1.0.0",
@@ -105,13 +104,13 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
-    "webpack": "^5.91.0",
+    "webpack": "^5.92.0",
     "webpack-dev-server": "^4.15.2"
   },
   "optionalDependencies": {
-    "@aws-sdk/client-s3": "^3.590.0",
-    "@aws-sdk/lib-storage": "^3.590.0",
-    "@aws-sdk/s3-request-presigner": "^3.590.0",
+    "@aws-sdk/client-s3": "^3.596.0",
+    "@aws-sdk/lib-storage": "^3.596.0",
+    "@aws-sdk/s3-request-presigner": "^3.596.0",
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "compression": "^1.7.4",
@@ -147,6 +146,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2024-06-14T04:16:50.830Z"
+    "publishedAt": "2024-06-14T14:22:13.242Z"
   }
 }

package/src/config-loader/env.ts

@@ -49,7 +49,7 @@ export const cache = {
 	apiKeyActorId: false as CacheOpts,
 };
 
-import { boolVar, intVar } from '@balena/env-parsing';
+import { boolVar } from '@balena/env-parsing';
 import memoize from 'memoizee';
 import memoizeWeak = require('memoizee/weak');
 export const createCache = <T extends (...args: any[]) => any>(
@@ -146,8 +146,3 @@ export const migrator = {
 	 */
 	asyncMigrationIsEnabled: boolVar('PINEJS_ASYNC_MIGRATION_ENABLED', true),
 };
-
-export const tasks = {
-	queueConcurrency: intVar('PINEJS_QUEUE_CONCURRENCY', 0),
-	queueIntervalMS: intVar('PINEJS_QUEUE_INTERVAL_MS', 1000),
-};

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

@@ -133,14 +133,15 @@ export async function setup(app, sbvrUtils, db) {
 						},
 					},
 				})
-				.then(async (/** @type { Array<{ [key: string]: any }> } */ result) => {
+				.then(async (result) => {
 					if (result.length === 0) {
 						throw new Error('No SE data model found');
 					}
 					const instance = result[0];
 					await sbvrUtils.executeModel(tx, {
 						apiRoot: instance.is_of__vocabulary,
-						modelText: instance.model_value.value,
+						// prettier-ignore
+						modelText: /** @type { string } */ (instance.model_value.value),
 					});
 				});
 			await isServerOnAir(true);