@budibase/server 1.0.105-alpha.21 → 1.0.105-alpha.24

package/dist/integrations/postgres.js

@@ -184,13 +184,13 @@ var PostgresModule;
                     // table key doesn't exist yet
                     if (!tables[tableName] || !tables[tableName].schema) {
                         tables[tableName] = {
-                            _id: utils_1.buildExternalTableId(datasourceId, tableName),
+                            _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),
                             primary: tableKeys[tableName] || [],
                             name: tableName,
                             schema: {},
                         };
                     }
-                    const type = utils_1.convertSqlType(column.data_type);
+                    const type = (0, utils_1.convertSqlType)(column.data_type);
                     const identity = !!(column.identity_generation ||
                         column.identity_start ||
                         column.identity_increment);
@@ -204,32 +204,32 @@ var PostgresModule;
                         type,
                     };
                 }
-                const final = utils_1.finaliseExternalTables(tables, entities);
+                const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                 this.tables = final.tables;
                 this.schemaErrors = final.errors;
             });
         }
         create(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery((0, utils_1.getSqlQuery)(query));
                 return response.rows.length ? response.rows : [{ created: true }];
             });
         }
         read(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery((0, utils_1.getSqlQuery)(query));
                 return response.rows;
             });
         }
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery((0, utils_1.getSqlQuery)(query));
                 return response.rows.length ? response.rows : [{ updated: true }];
             });
         }
         delete(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery((0, utils_1.getSqlQuery)(query));
                 return response.rows.length ? response.rows : [{ deleted: true }];
             });
         }

package/dist/integrations/rest.js

@@ -149,7 +149,7 @@ var RestModule;
                 // Check if a pagination cursor exists in the response
                 let nextCursor = null;
                 if (pagination === null || pagination === void 0 ? void 0 : pagination.responseParam) {
-                    nextCursor = lodash_1.get(data, pagination.responseParam);
+                    nextCursor = (0, lodash_1.get)(data, pagination.responseParam);
                 }
                 return {
                     data,

package/dist/middleware/authorized.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getUserRoleHierarchy, getRequiredResourceRole, BUILTIN_ROLE_IDS, } = require("@budibase/backend-core/roles");
+const roles_1 = require("@budibase/backend-core/roles");
 const { PermissionTypes, PermissionLevels, doesHaveBasePermission, } = require("@budibase/backend-core/permissions");
 const builderMiddleware = require("./builder");
 const { isWebhookEndpoint } = require("./utils");
@@ -38,15 +38,15 @@ const checkAuthorized = (ctx, resourceRoles, permType, permLevel) => __awaiter(v
 });
 const checkAuthorizedResource = (ctx, resourceRoles, permType, permLevel) => __awaiter(void 0, void 0, void 0, function* () {
     // get the user's roles
-    const roleId = ctx.roleId || BUILTIN_ROLE_IDS.PUBLIC;
-    const userRoles = yield getUserRoleHierarchy(roleId, {
+    const roleId = ctx.roleId || roles_1.BUILTIN_ROLE_IDS.PUBLIC;
+    const userRoles = yield (0, roles_1.getUserRoleHierarchy)(roleId, {
         idOnly: false,
     });
     const permError = "User does not have permission";
     // check if the user has the required role
     if (resourceRoles.length > 0) {
         // deny access if the user doesn't have the required resource role
-        const found = userRoles.find(role => resourceRoles.indexOf(role._id) !== -1);
+        const found = userRoles.find((role) => resourceRoles.indexOf(role._id) !== -1);
         if (!found) {
             ctx.throw(403, permError);
         }
@@ -56,53 +56,53 @@ const checkAuthorizedResource = (ctx, resourceRoles, permType, permLevel) => __a
         ctx.throw(403, permError);
     }
 });
-module.exports =
-    (permType, permLevel = null, opts = { schema: false }) => (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-        // webhooks don't need authentication, each webhook unique
-        // also internal requests (between services) don't need authorized
-        if (isWebhookEndpoint(ctx) || ctx.internal) {
-            return next();
-        }
-        if (!ctx.user) {
-            return ctx.throw(403, "No user info found");
-        }
-        // check general builder stuff, this middleware is a good way
-        // to find API endpoints which are builder focused
-        yield builderMiddleware(ctx, permType);
-        // get the resource roles
-        let resourceRoles = [], otherLevelRoles;
-        const otherLevel = permLevel === PermissionLevels.READ
-            ? PermissionLevels.WRITE
-            : PermissionLevels.READ;
-        const appId = getAppId();
-        if (appId && hasResource(ctx)) {
-            resourceRoles = yield getRequiredResourceRole(permLevel, ctx);
-            if (opts && opts.schema) {
-                otherLevelRoles = yield getRequiredResourceRole(otherLevel, ctx);
-            }
-        }
-        // if the resource is public, proceed
-        if (resourceRoles.includes(BUILTIN_ROLE_IDS.PUBLIC) ||
-            (otherLevelRoles && otherLevelRoles.includes(BUILTIN_ROLE_IDS.PUBLIC))) {
-            return next();
-        }
-        // check authenticated
-        if (!ctx.isAuthenticated) {
-            return ctx.throw(403, "Session not authenticated");
+module.exports = (permType, permLevel = null, opts = { schema: false }) => (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+    // webhooks don't need authentication, each webhook unique
+    // also internal requests (between services) don't need authorized
+    if (isWebhookEndpoint(ctx) || ctx.internal) {
+        return next();
+    }
+    if (!ctx.user) {
+        return ctx.throw(403, "No user info found");
+    }
+    // check general builder stuff, this middleware is a good way
+    // to find API endpoints which are builder focused
+    yield builderMiddleware(ctx, permType);
+    // get the resource roles
+    let resourceRoles = [];
+    let otherLevelRoles = [];
+    const otherLevel = permLevel === PermissionLevels.READ
+        ? PermissionLevels.WRITE
+        : PermissionLevels.READ;
+    const appId = getAppId();
+    if (appId && hasResource(ctx)) {
+        resourceRoles = yield (0, roles_1.getRequiredResourceRole)(permLevel, ctx);
+        if (opts && opts.schema) {
+            otherLevelRoles = yield (0, roles_1.getRequiredResourceRole)(otherLevel, ctx);
         }
-        try {
-            // check authorized
-            yield checkAuthorized(ctx, resourceRoles, permType, permLevel);
+    }
+    // if the resource is public, proceed
+    if (resourceRoles.includes(roles_1.BUILTIN_ROLE_IDS.PUBLIC) ||
+        (otherLevelRoles && otherLevelRoles.includes(roles_1.BUILTIN_ROLE_IDS.PUBLIC))) {
+        return next();
+    }
+    // check authenticated
+    if (!ctx.isAuthenticated) {
+        return ctx.throw(403, "Session not authenticated");
+    }
+    try {
+        // check authorized
+        yield checkAuthorized(ctx, resourceRoles, permType, permLevel);
+    }
+    catch (err) {
+        // this is a schema, check if
+        if (opts && opts.schema && permLevel) {
+            yield checkAuthorized(ctx, otherLevelRoles, permType, otherLevel);
         }
-        catch (err) {
-            // this is a schema, check if
-            if (opts && opts.schema && permLevel) {
-                yield checkAuthorized(ctx, otherLevelRoles, permType, otherLevel);
-            }
-            else {
-                throw err;
-            }
+        else {
+            throw err;
         }
-        // csrf protection
-        return csrf(ctx, next);
-    });
+    }
+    // csrf protection
+    return csrf(ctx, next);
+});

package/dist/migrations/functions/appUrls.js

@@ -38,7 +38,7 @@ const run = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
                 },
             },
         };
-        metadata.url = application_1.getAppUrl(context);
+        metadata.url = (0, application_1.getAppUrl)(context);
         console.log(`Adding url to app: ${metadata.url}`);
         yield appDb.put(metadata);
     }

package/dist/migrations/functions/developerQuota.js

@@ -0,0 +1,49 @@
+"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;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const { createUserBuildersView } = require("@budibase/backend-core/db");
+const syncDevelopers = __importStar(require("./usageQuotas/syncDevelopers"));
+/**
+ * Date:
+ * March 2022
+ *
+ * Description:
+ * Create the builder users view and sync the developer count
+ */
+const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    yield createUserBuildersView(db);
+    yield syncDevelopers.run();
+});
+exports.run = run;

package/dist/migrations/functions/publishedAppsQuota.js

@@ -0,0 +1,47 @@
+"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;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const syncPublishedApps = __importStar(require("./usageQuotas/syncPublishedApps"));
+/**
+ * Date:
+ * March 2022
+ *
+ * Description:
+ * Sync the published apps count
+ */
+const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    yield syncPublishedApps.run();
+});
+exports.run = run;

package/dist/migrations/functions/quotas1.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -42,7 +46,7 @@ const syncRows = __importStar(require("./usageQuotas/syncRows"));
  * weren't being decremented correctly.
  */
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
-    yield usageQuotas_1.runQuotaMigration(() => __awaiter(void 0, void 0, void 0, function* () {
+    yield (0, usageQuotas_1.runQuotaMigration)(() => __awaiter(void 0, void 0, void 0, function* () {
         yield syncApps.run();
         yield syncRows.run();
     }));

package/dist/migrations/functions/usageQuotas/index.js

@@ -10,11 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runQuotaMigration = void 0;
-const { useQuotas } = require("../../../utilities/usageQuota");
 const runQuotaMigration = (migration) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!useQuotas()) {
-        return;
-    }
     yield migration();
 });
 exports.runQuotaMigration = runQuotaMigration;

package/dist/migrations/functions/usageQuotas/syncApps.js

@@ -12,18 +12,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const tenancy_1 = require("@budibase/backend-core/tenancy");
 const db_1 = require("@budibase/backend-core/db");
-const usageQuota_1 = require("../../../utilities/usageQuota");
+const pro_1 = require("@budibase/pro");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = tenancy_1.getGlobalDB();
     // get app count
     // @ts-ignore
-    const devApps = yield db_1.getAllApps({ dev: true });
+    const devApps = yield (0, db_1.getAllApps)({ dev: true });
     const appCount = devApps ? devApps.length : 0;
     // sync app count
-    const tenantId = tenancy_1.getTenantId();
+    const tenantId = (0, tenancy_1.getTenantId)();
     console.log(`[Tenant: ${tenantId}] Syncing app count: ${appCount}`);
-    const usageDoc = yield usageQuota_1.getUsageQuotaDoc(db);
-    usageDoc.usageQuota.apps = appCount;
-    yield db.put(usageDoc);
+    yield pro_1.quotas.setUsage(appCount, pro_1.StaticQuotaName.APPS, pro_1.QuotaUsageType.STATIC);
 });
 exports.run = run;

package/dist/migrations/functions/usageQuotas/syncDevelopers.js

@@ -0,0 +1,24 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    // get developer count
+    const developerCount = yield backend_core_1.utils.getBuildersCount();
+    // sync developer count
+    const tenantId = (0, tenancy_1.getTenantId)();
+    console.log(`[Tenant: ${tenantId}] Syncing developer count: ${developerCount}`);
+    yield pro_1.quotas.setUsage(developerCount, pro_1.StaticQuotaName.DEVELOPERS, pro_1.QuotaUsageType.STATIC);
+});
+exports.run = run;

package/dist/migrations/functions/usageQuotas/syncPublishedApps.js

@@ -0,0 +1,26 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const db_1 = require("@budibase/backend-core/db");
+const pro_1 = require("@budibase/pro");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    // get app count
+    const opts = { dev: false };
+    const prodApps = yield (0, db_1.getAllApps)(opts);
+    const prodAppCount = prodApps ? prodApps.length : 0;
+    // sync app count
+    const tenantId = (0, tenancy_1.getTenantId)();
+    console.log(`[Tenant: ${tenantId}] Syncing published app count: ${prodAppCount}`);
+    yield pro_1.quotas.setUsage(prodAppCount, pro_1.StaticQuotaName.PUBLISHED_APPS, pro_1.QuotaUsageType.STATIC);
+});
+exports.run = run;

package/dist/migrations/functions/usageQuotas/syncRows.js

@@ -12,22 +12,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const tenancy_1 = require("@budibase/backend-core/tenancy");
 const db_1 = require("@budibase/backend-core/db");
-const usageQuota_1 = require("../../../utilities/usageQuota");
 const rows_1 = require("../../../utilities/usageQuota/rows");
+const pro_1 = require("@budibase/pro");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = tenancy_1.getGlobalDB();
     // get all rows in all apps
     // @ts-ignore
-    const allApps = yield db_1.getAllApps({ all: true });
+    const allApps = yield (0, db_1.getAllApps)({ all: true });
     // @ts-ignore
     const appIds = allApps ? allApps.map((app) => app.appId) : [];
-    const rows = yield rows_1.getUniqueRows(appIds);
+    const rows = yield (0, rows_1.getUniqueRows)(appIds);
     const rowCount = rows ? rows.length : 0;
     // sync row count
-    const tenantId = tenancy_1.getTenantId();
+    const tenantId = (0, tenancy_1.getTenantId)();
     console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
-    const usageDoc = yield usageQuota_1.getUsageQuotaDoc(db);
-    usageDoc.usageQuota.rows = rowCount;
-    yield db.put(usageDoc);
+    yield pro_1.quotas.setUsage(rowCount, pro_1.StaticQuotaName.ROWS, pro_1.QuotaUsageType.STATIC);
 });
 exports.run = run;

package/dist/migrations/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -38,6 +42,8 @@ const { MIGRATION_TYPES, runMigrations, } = require("@budibase/backend-core/migr
 const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
 const quota1 = __importStar(require("./functions/quotas1"));
 const appUrls = __importStar(require("./functions/appUrls"));
+const developerQuota = __importStar(require("./functions/developerQuota"));
+const publishedAppsQuota = __importStar(require("./functions/publishedAppsQuota"));
 exports.MIGRATIONS = [
     {
         type: MIGRATION_TYPES.GLOBAL,
@@ -55,6 +61,16 @@ exports.MIGRATIONS = [
         opts: { all: true },
         fn: appUrls.run,
     },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "developer_quota",
+        fn: developerQuota.run,
+    },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "published_apps_quota",
+        fn: publishedAppsQuota.run,
+    },
 ];
 const migrate = (options) => __awaiter(void 0, void 0, void 0, function* () {
     yield runMigrations(db_1.default, exports.MIGRATIONS, options);

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.105-alpha.20",
+    "version": "1.0.105-alpha.23",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -9,7 +9,7 @@
         "url": "https://github.com/Budibase/budibase.git"
     },
     "scripts": {
-        "build": "rimraf dist/ && tsc && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
+        "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
         "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
         "test": "jest --coverage --maxWorkers=2",
         "test:watch": "jest --watch",
@@ -68,16 +68,17 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.105-alpha.20",
-        "@budibase/client": "^1.0.105-alpha.20",
-        "@budibase/string-templates": "^1.0.105-alpha.20",
+        "@budibase/backend-core": "^1.0.105-alpha.23",
+        "@budibase/client": "^1.0.105-alpha.23",
+        "@budibase/string-templates": "^1.0.105-alpha.23",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
         "@google-cloud/firestore": "^5.0.2",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
-        "@sentry/node": "^6.0.0",
+        "@sentry/node": "6.17.7",
+        "@types/koa__router": "^8.0.11",
         "airtable": "0.10.1",
         "arangojs": "7.2.0",
         "aws-sdk": "^2.767.0",
@@ -143,13 +144,14 @@
         "@types/apidoc": "^0.50.0",
         "@types/bull": "^3.15.1",
         "@types/google-spreadsheet": "^3.1.5",
-        "@types/jest": "^26.0.23",
+        "@types/jest": "^27.4.1",
         "@types/koa": "^2.13.3",
         "@types/koa-router": "^7.4.2",
         "@types/lodash": "4.14.180",
         "@types/node": "^15.12.4",
         "@types/oracledb": "^5.2.1",
         "@types/redis": "^4.0.11",
+        "@typescript-eslint/parser": "5.12.0",
         "apidoc": "^0.50.2",
         "babel-jest": "^27.0.2",
         "copyfiles": "^2.4.1",
@@ -168,7 +170,7 @@
         "swagger-jsdoc": "^6.1.0",
         "ts-jest": "^27.0.3",
         "ts-node": "^10.0.0",
-        "typescript": "^4.3.5",
+        "typescript": "^4.5.5",
         "update-dotenv": "^1.1.1"
     },
     "optionalDependencies": {

package/dist/threads/index.js

@@ -1,17 +1,45 @@
 "use strict";
-const workerFarm = require("worker-farm");
-const env = require("../environment");
-const ThreadType = {
+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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Thread = exports.ThreadType = void 0;
+const worker_farm_1 = __importDefault(require("worker-farm"));
+const env = __importStar(require("../environment"));
+exports.ThreadType = {
     QUERY: "query",
     AUTOMATION: "automation",
 };
 function typeToFile(type) {
     let filename = null;
     switch (type) {
-        case ThreadType.QUERY:
+        case exports.ThreadType.QUERY:
             filename = "./query";
             break;
-        case ThreadType.AUTOMATION:
+        case exports.ThreadType.AUTOMATION:
             filename = "./automation";
             break;
         default:
@@ -36,7 +64,7 @@ class Thread {
             if (opts.timeoutMs) {
                 workerOpts.maxCallTime = opts.timeoutMs;
             }
-            this.workers = workerFarm(workerOpts, typeToFile(type));
+            this.workers = (0, worker_farm_1.default)(workerOpts, typeToFile(type));
         }
     }
     run(data) {
@@ -60,5 +88,4 @@ class Thread {
         });
     }
 }
-module.exports.Thread = Thread;
-module.exports.ThreadType = ThreadType;
+exports.Thread = Thread;