@budibase/server 2.1.31 → 2.1.32-alpha.0

package/dist/middleware/appInfo.js

@@ -1,17 +1,22 @@
 "use strict";
-const { isDevAppID, isProdAppID } = require("../db/utils");
-exports.AppType = {
-    DEV: "dev",
-    PROD: "prod",
-};
-exports.middleware =
-    ({ appType } = {}) => (ctx, next) => {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.middleware = exports.AppType = void 0;
+const utils_1 = require("../db/utils");
+var AppType;
+(function (AppType) {
+    AppType["DEV"] = "dev";
+    AppType["PROD"] = "prod";
+})(AppType = exports.AppType || (exports.AppType = {}));
+function middleware({ appType } = {}) {
+    return (ctx, next) => {
         const appId = ctx.appId;
-        if (appType === exports.AppType.DEV && appId && !isDevAppID(appId)) {
+        if (appType === AppType.DEV && appId && !(0, utils_1.isDevAppID)(appId)) {
             ctx.throw(400, "Only apps in development support this endpoint");
         }
-        if (appType === exports.AppType.PROD && appId && !isProdAppID(appId)) {
+        if (appType === AppType.PROD && appId && !(0, utils_1.isProdAppID)(appId)) {
             ctx.throw(400, "Only apps in production support this endpoint");
         }
         return next();
     };
+}
+exports.middleware = middleware;

package/dist/middleware/authorized.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const roles_1 = require("@budibase/backend-core/roles");
-const { PermissionTypes, PermissionLevels, doesHaveBasePermission, } = require("@budibase/backend-core/permissions");
+const { PermissionType, PermissionLevel, doesHaveBasePermission, } = require("@budibase/backend-core/permissions");
 const builderMiddleware = require("./builder");
 const { isWebhookEndpoint } = require("./utils");
 const { buildCsrfMiddleware } = require("@budibase/backend-core/auth");
@@ -27,7 +27,7 @@ const csrf = buildCsrfMiddleware();
 const checkAuthorized = (ctx, resourceRoles, permType, permLevel) => __awaiter(void 0, void 0, void 0, function* () {
     // check if this is a builder api and the user is not a builder
     const isBuilder = ctx.user && ctx.user.builder && ctx.user.builder.global;
-    const isBuilderApi = permType === PermissionTypes.BUILDER;
+    const isBuilderApi = permType === PermissionType.BUILDER;
     if (isBuilderApi && !isBuilder) {
         return ctx.throw(403, "Not Authorized");
     }
@@ -71,9 +71,9 @@ module.exports = (permType, permLevel = null, opts = { schema: false }) => (ctx,
     // get the resource roles
     let resourceRoles = [];
     let otherLevelRoles = [];
-    const otherLevel = permLevel === PermissionLevels.READ
-        ? PermissionLevels.WRITE
-        : PermissionLevels.READ;
+    const otherLevel = permLevel === PermissionLevel.READ
+        ? PermissionLevel.WRITE
+        : PermissionLevel.READ;
     const appId = getAppId();
     if (appId && hasResource(ctx)) {
         resourceRoles = yield (0, roles_1.getRequiredResourceRole)(permLevel, ctx);

package/dist/middleware/builder.js

@@ -8,12 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { APP_DEV_PREFIX } = require("../db/utils");
-const { doesUserHaveLock, updateLock, checkDebounce, setDebounce, } = require("../utilities/redis");
-const { doWithDB } = require("@budibase/backend-core/db");
-const { DocumentType, getGlobalIDFromUserMetadataID } = require("../db/utils");
-const { PermissionTypes } = require("@budibase/backend-core/permissions");
-const { app: appCache } = require("@budibase/backend-core/cache");
+const utils_1 = require("../db/utils");
+const redis_1 = require("../utilities/redis");
+const backend_core_1 = require("@budibase/backend-core");
 const DEBOUNCE_TIME_SEC = 30;
 /************************************************** *
  * This middleware has been broken out of the       *
@@ -24,21 +21,22 @@ const DEBOUNCE_TIME_SEC = 30;
  * through the authorized middleware                *
  ****************************************************/
 function checkDevAppLocks(ctx) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         // if any public usage, don't proceed
-        if (!ctx.user._id && !ctx.user.userId) {
+        if (!((_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id) && !((_b = ctx.user) === null || _b === void 0 ? void 0 : _b.userId)) {
             return;
         }
         // not a development app, don't need to do anything
-        if (!appId || !appId.startsWith(APP_DEV_PREFIX)) {
+        if (!appId || !appId.startsWith(utils_1.APP_DEV_PREFIX)) {
             return;
         }
-        if (!(yield doesUserHaveLock(appId, ctx.user))) {
+        if (!(yield (0, redis_1.doesUserHaveLock)(appId, ctx.user))) {
             ctx.throw(400, "User does not hold app lock.");
         }
         // they do have lock, update it
-        yield updateLock(appId, ctx.user);
+        yield (0, redis_1.updateLock)(appId, ctx.user);
     });
 }
 function updateAppUpdatedAt(ctx) {
@@ -46,42 +44,45 @@ function updateAppUpdatedAt(ctx) {
         const appId = ctx.appId;
         // if debouncing skip this update
         // get methods also aren't updating
-        if (ctx.method === "GET" || (yield checkDebounce(appId))) {
+        if (ctx.method === "GET" || (yield (0, redis_1.checkDebounce)(appId))) {
             return;
         }
-        yield doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
-            const metadata = yield db.get(DocumentType.APP_METADATA);
+        yield backend_core_1.db.doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const metadata = yield db.get(utils_1.DocumentType.APP_METADATA);
             metadata.updatedAt = new Date().toISOString();
-            metadata.updatedBy = getGlobalIDFromUserMetadataID(ctx.user.userId);
+            metadata.updatedBy = (0, utils_1.getGlobalIDFromUserMetadataID)((_a = ctx.user) === null || _a === void 0 ? void 0 : _a.userId);
             const response = yield db.put(metadata);
             metadata._rev = response.rev;
-            yield appCache.invalidateAppMetadata(appId, metadata);
+            yield backend_core_1.cache.app.invalidateAppMetadata(appId, metadata);
             // set a new debounce record with a short TTL
-            yield setDebounce(appId, DEBOUNCE_TIME_SEC);
+            yield (0, redis_1.setDebounce)(appId, DEBOUNCE_TIME_SEC);
         }));
     });
 }
-module.exports = (ctx, permType) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
-    // this only functions within an app context
-    if (!appId) {
-        return;
-    }
-    const isBuilderApi = permType === PermissionTypes.BUILDER;
-    const referer = ctx.headers["referer"];
-    const overviewPath = "/builder/portal/overview/";
-    const overviewContext = !referer ? false : referer.includes(overviewPath);
-    if (overviewContext) {
-        return;
-    }
-    const hasAppId = !referer ? false : referer.includes(appId);
-    const editingApp = referer ? hasAppId : false;
-    // check this is a builder call and editing
-    if (!isBuilderApi || !editingApp) {
-        return;
-    }
-    // check locks
-    yield checkDevAppLocks(ctx);
-    // set updated at time on app
-    yield updateAppUpdatedAt(ctx);
-});
+module.exports = function builder(ctx, permType) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appId = ctx.appId;
+        // this only functions within an app context
+        if (!appId) {
+            return;
+        }
+        const isBuilderApi = permType === backend_core_1.permissions.PermissionType.BUILDER;
+        const referer = ctx.headers["referer"];
+        const overviewPath = "/builder/portal/overview/";
+        const overviewContext = !referer ? false : referer.includes(overviewPath);
+        if (overviewContext) {
+            return;
+        }
+        const hasAppId = !referer ? false : referer.includes(appId);
+        const editingApp = referer ? hasAppId : false;
+        // check this is a builder call and editing
+        if (!isBuilderApi || !editingApp) {
+            return;
+        }
+        // check locks
+        yield checkDevAppLocks(ctx);
+        // set updated at time on app
+        yield updateAppUpdatedAt(ctx);
+    });
+};

package/dist/middleware/currentapp.js

@@ -8,27 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getAppIdFromCtx, setCookie, getCookie, clearCookie, } = require("@budibase/backend-core/utils");
-const { Cookies, Headers } = require("@budibase/backend-core/constants");
-const { getRole } = require("@budibase/backend-core/roles");
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { generateUserMetadataID, isDevAppID } = require("../db/utils");
-const { dbExists } = require("@budibase/backend-core/db");
-const { isUserInAppTenant } = require("@budibase/backend-core/tenancy");
-const { getCachedSelf } = require("../utilities/global");
-const env = require("../environment");
-const { isWebhookEndpoint } = require("./utils");
-const { doInAppContext } = require("@budibase/backend-core/context");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../db/utils");
+const global_1 = require("../utilities/global");
+const environment_1 = __importDefault(require("../environment"));
+const utils_2 = require("./utils");
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // try to get the appID from the request
-    let requestAppId = yield getAppIdFromCtx(ctx);
+    let requestAppId = yield backend_core_1.utils.getAppIdFromCtx(ctx);
     // get app cookie if it exists
-    let appCookie = null;
+    let appCookie;
     try {
-        appCookie = getCookie(ctx, Cookies.CurrentApp);
+        appCookie = backend_core_1.utils.getCookie(ctx, backend_core_1.constants.Cookie.CurrentApp);
     }
     catch (err) {
-        clearCookie(ctx, Cookies.CurrentApp);
+        backend_core_1.utils.clearCookie(ctx, backend_core_1.constants.Cookie.CurrentApp);
     }
     if (!appCookie && !requestAppId) {
         return next();
@@ -36,46 +33,49 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // check the app exists referenced in cookie
     if (appCookie) {
         const appId = appCookie.appId;
-        const exists = yield dbExists(appId);
+        const exists = yield backend_core_1.db.dbExists(appId);
         if (!exists) {
-            clearCookie(ctx, Cookies.CurrentApp);
+            backend_core_1.utils.clearCookie(ctx, backend_core_1.constants.Cookie.CurrentApp);
             return next();
         }
         // if the request app ID wasn't set, update it with the cookie
         requestAppId = requestAppId || appId;
     }
     // deny access to application preview
-    if (!env.isTest()) {
-        if (isDevAppID(requestAppId) &&
-            !isWebhookEndpoint(ctx) &&
+    if (!environment_1.default.isTest()) {
+        if ((0, utils_1.isDevAppID)(requestAppId) &&
+            !(0, utils_2.isWebhookEndpoint)(ctx) &&
             (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
-            clearCookie(ctx, Cookies.CurrentApp);
+            backend_core_1.utils.clearCookie(ctx, backend_core_1.constants.Cookie.CurrentApp);
             return ctx.redirect("/");
         }
     }
-    let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;
+    let appId, roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
     if (!ctx.user) {
         // not logged in, try to set a cookie for public apps
         appId = requestAppId;
     }
     else if (requestAppId != null) {
         // Different App ID means cookie needs reset, or if the same public user has logged in
-        const globalUser = yield getCachedSelf(ctx, requestAppId);
+        const globalUser = yield (0, global_1.getCachedSelf)(ctx, requestAppId);
         appId = requestAppId;
         // retrieving global user gets the right role
         roleId = globalUser.roleId || roleId;
         // Allow builders to specify their role via a header
         const isBuilder = globalUser && globalUser.builder && globalUser.builder.global;
-        const isDevApp = appId && isDevAppID(appId);
-        const roleHeader = ctx.request && ctx.request.headers[Headers.PREVIEW_ROLE];
+        const isDevApp = appId && (0, utils_1.isDevAppID)(appId);
+        const roleHeader = ctx.request &&
+            ctx.request.headers[backend_core_1.constants.Header.PREVIEW_ROLE];
         if (isBuilder && isDevApp && roleHeader) {
             // Ensure the role is valid by ensuring a definition exists
             try {
-                yield getRole(roleHeader);
-                roleId = roleHeader;
-                // Delete admin and builder flags so that the specified role is honoured
-                delete ctx.user.builder;
-                delete ctx.user.admin;
+                if (roleHeader) {
+                    yield backend_core_1.roles.getRole(roleHeader);
+                    roleId = roleHeader;
+                    // Delete admin and builder flags so that the specified role is honoured
+                    delete ctx.user.builder;
+                    delete ctx.user.admin;
+                }
             }
             catch (error) {
                 // Swallow error and do nothing
@@ -86,38 +86,40 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     if (!appId) {
         return next();
     }
-    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+    return backend_core_1.context.doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
         let skipCookie = false;
         // if the user not in the right tenant then make sure they have no permissions
         // need to judge this only based on the request app ID,
-        if (env.MULTI_TENANCY &&
+        if (environment_1.default.MULTI_TENANCY &&
             ctx.user &&
             requestAppId &&
-            !isUserInAppTenant(requestAppId, ctx.user)) {
+            !backend_core_1.tenancy.isUserInAppTenant(requestAppId, ctx.user)) {
             // don't error, simply remove the users rights (they are a public user)
             delete ctx.user.builder;
             delete ctx.user.admin;
             delete ctx.user.roles;
             ctx.isAuthenticated = false;
-            roleId = BUILTIN_ROLE_IDS.PUBLIC;
+            roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
             skipCookie = true;
         }
         ctx.appId = appId;
         if (roleId) {
             ctx.roleId = roleId;
             const globalId = ctx.user ? ctx.user._id : undefined;
-            const userId = ctx.user ? generateUserMetadataID(ctx.user._id) : null;
+            const userId = ctx.user
+                ? (0, utils_1.generateUserMetadataID)(ctx.user._id)
+                : undefined;
             ctx.user = Object.assign(Object.assign({}, ctx.user), { 
                 // override userID with metadata one
                 _id: userId, userId,
                 globalId,
-                roleId, role: yield getRole(roleId) });
+                roleId, role: yield backend_core_1.roles.getRole(roleId) });
         }
         if ((requestAppId !== appId ||
             appCookie == null ||
             appCookie.appId !== requestAppId) &&
             !skipCookie) {
-            setCookie(ctx, { appId }, Cookies.CurrentApp);
+            backend_core_1.utils.setCookie(ctx, { appId }, backend_core_1.constants.Cookie.CurrentApp);
         }
         return next();
     }));

package/dist/middleware/joi-validator.js

@@ -1,5 +1,10 @@
 "use strict";
-const Joi = require("joi");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.params = exports.body = void 0;
+const joi_1 = __importDefault(require("joi"));
 function validate(schema, property) {
     // Return a Koa middleware function
     return (ctx, next) => {
@@ -10,14 +15,14 @@ function validate(schema, property) {
         if (ctx[property] != null) {
             params = ctx[property];
         }
-        else if (ctx.request[property] != null) {
-            params = ctx.request[property];
+        else if (ctx.request.get(property) != null) {
+            params = ctx.request.get(property);
         }
         // not all schemas have the append property e.g. array schemas
-        if (schema.append) {
+        if ("append" in schema && schema.append) {
             schema = schema.append({
-                createdAt: Joi.any().optional(),
-                updatedAt: Joi.any().optional(),
+                createdAt: joi_1.default.any().optional(),
+                updatedAt: joi_1.default.any().optional(),
             });
         }
         const { error } = schema.validate(params);
@@ -28,9 +33,11 @@ function validate(schema, property) {
         return next();
     };
 }
-module.exports.body = schema => {
+function body(schema) {
     return validate(schema, "body");
-};
-module.exports.params = schema => {
+}
+exports.body = body;
+function params(schema) {
     return validate(schema, "params");
-};
+}
+exports.params = params;

package/dist/middleware/publicApi.js

@@ -8,16 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { Headers } = require("@budibase/backend-core/constants");
-const { getAppIdFromCtx } = require("@budibase/backend-core/utils");
+const backend_core_1 = require("@budibase/backend-core");
 module.exports = function ({ requiresAppId } = {}) {
     return (ctx, next) => __awaiter(this, void 0, void 0, function* () {
-        const appId = yield getAppIdFromCtx(ctx);
+        const appId = yield backend_core_1.utils.getAppIdFromCtx(ctx);
         if (requiresAppId && !appId) {
-            ctx.throw(400, `Invalid app ID provided, please check the ${Headers.APP_ID} header.`);
+            ctx.throw(400, `Invalid app ID provided, please check the ${backend_core_1.constants.Header.APP_ID} header.`);
         }
-        if (!ctx.headers[Headers.API_KEY]) {
-            ctx.throw(400, `Invalid API key provided, please check the ${Headers.API_KEY} header.`);
+        if (!ctx.headers[backend_core_1.constants.Header.API_KEY]) {
+            ctx.throw(400, `Invalid API key provided, please check the ${backend_core_1.constants.Header.API_KEY} header.`);
         }
         return next();
     });

package/dist/middleware/resourceId.js

@@ -1,4 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bodySubResource = exports.bodyResource = exports.paramSubResource = exports.paramResource = exports.ResourceIdGetter = void 0;
 class ResourceIdGetter {
     constructor(ctxProperty) {
         this.parameter = ctxProperty;
@@ -17,6 +19,7 @@ class ResourceIdGetter {
     build() {
         const parameter = this.parameter, main = this.main, sub = this.sub;
         return (ctx, next) => {
+            // @ts-ignore
             const request = ctx.request[parameter] || ctx[parameter];
             if (request == null) {
                 return next();
@@ -31,22 +34,26 @@ class ResourceIdGetter {
         };
     }
 }
-module.exports.ResourceIdGetter = ResourceIdGetter;
-module.exports.paramResource = main => {
+exports.ResourceIdGetter = ResourceIdGetter;
+function paramResource(main) {
     return new ResourceIdGetter("params").mainResource(main).build();
-};
-module.exports.paramSubResource = (main, sub) => {
+}
+exports.paramResource = paramResource;
+function paramSubResource(main, sub) {
     return new ResourceIdGetter("params")
         .mainResource(main)
         .subResource(sub)
         .build();
-};
-module.exports.bodyResource = main => {
+}
+exports.paramSubResource = paramSubResource;
+function bodyResource(main) {
     return new ResourceIdGetter("body").mainResource(main).build();
-};
-module.exports.bodySubResource = (main, sub) => {
+}
+exports.bodyResource = bodyResource;
+function bodySubResource(main, sub) {
     return new ResourceIdGetter("body")
         .mainResource(main)
         .subResource(sub)
         .build();
-};
+}
+exports.bodySubResource = bodySubResource;

package/dist/middleware/selfhost.js

@@ -8,11 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const env = require("../environment");
-// if added as a middleware will stop requests unless builder is in self host mode
-// or cloud is in self host
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const environment_1 = __importDefault(require("../environment"));
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (env.SELF_HOSTED) {
+    if (environment_1.default.SELF_HOSTED) {
         yield next();
         return;
     }

package/dist/middleware/utils.js

@@ -1,5 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isWebhookEndpoint = void 0;
 const WEBHOOK_ENDPOINTS = new RegExp(["webhooks/trigger", "webhooks/schema"].join("|"));
-exports.isWebhookEndpoint = ctx => {
+function isWebhookEndpoint(ctx) {
     return WEBHOOK_ENDPOINTS.test(ctx.request.url);
-};
+}
+exports.isWebhookEndpoint = isWebhookEndpoint;

package/dist/migrations/functions/backfill/global.js

@@ -156,7 +156,7 @@ const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
             handleError(e, errors);
         }
         try {
-            const allApps = yield backend_core_1.db.getAllApps({ dev: true });
+            const allApps = (yield backend_core_1.db.getAllApps({ dev: true }));
             totals.apps = allApps.length;
             totals.usage = yield quotas.backfill(allApps);
         }

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

@@ -17,7 +17,7 @@ const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
     // get all rows in all apps
-    const allApps = yield (0, db_1.getAllApps)({ all: true });
+    const allApps = (yield (0, db_1.getAllApps)({ all: true }));
     const appIds = allApps ? allApps.map((app) => app.appId) : [];
     const { appRows } = yield (0, rows_1.getUniqueRows)(appIds);
     // get the counts per app

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.1.30",
+    "version": "2.1.31",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -36,40 +36,6 @@
         "env:account:enable": "node scripts/account.js enable",
         "env:account:disable": "node scripts/account.js disable"
     },
-    "jest": {
-        "preset": "ts-jest",
-        "testEnvironment": "node",
-        "moduleNameMapper": {
-            "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
-            "@budibase/backend-core": "<rootDir>/../backend-core/src",
-            "@budibase/types": "<rootDir>/../types/src"
-        },
-        "setupFiles": [
-            "./scripts/jestSetup.js"
-        ],
-        "collectCoverageFrom": [
-            "src/**/*.js",
-            "!**/node_modules/**",
-            "!src/db/views/*.js",
-            "!src/api/controllers/deploy/**/*.js",
-            "!src/*.js",
-            "!src/api/controllers/static/**/*",
-            "!src/db/dynamoClient.js",
-            "!src/utilities/usageQuota.js",
-            "!src/api/routes/tests/**/*",
-            "!src/db/tests/**/*",
-            "!src/tests/**/*",
-            "!src/automations/tests/**/*",
-            "!src/utilities/fileProcessor.js",
-            "!src/utilities/fileSystem/**/*",
-            "!src/utilities/redis.js"
-        ],
-        "coverageReporters": [
-            "lcov",
-            "json",
-            "clover"
-        ]
-    },
     "keywords": [
         "budibase"
     ],
@@ -77,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^2.1.30",
-        "@budibase/client": "^2.1.30",
-        "@budibase/pro": "2.1.30",
-        "@budibase/string-templates": "^2.1.30",
-        "@budibase/types": "^2.1.30",
+        "@budibase/backend-core": "^2.1.31",
+        "@budibase/client": "^2.1.31",
+        "@budibase/pro": "2.1.31",
+        "@budibase/string-templates": "^2.1.31",
+        "@budibase/types": "^2.1.31",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -179,7 +145,7 @@
         "eslint": "6.8.0",
         "ioredis-mock": "7.2.0",
         "is-wsl": "2.2.0",
-        "jest": "27.5.1",
+        "jest": "28.1.1",
         "jest-openapi": "0.14.2",
         "nodemon": "2.0.15",
         "openapi-types": "9.3.1",
@@ -190,10 +156,10 @@
         "supertest": "4.0.2",
         "swagger-jsdoc": "6.1.0",
         "timekeeper": "2.2.0",
-        "ts-jest": "27.1.3",
-        "ts-node": "10.5.0",
+        "ts-jest": "28.0.4",
+        "ts-node": "10.8.1",
         "tsconfig-paths": "4.0.0",
-        "typescript": "4.6.2",
+        "typescript": "4.7.3",
         "update-dotenv": "1.1.1"
     },
     "optionalDependencies": {

package/dist/sdk/app/tables/index.js

@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const context_1 = require("@budibase/backend-core/context");
+const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
 const utils_2 = require("../../../integrations/utils");
 function getAllInternalTables(db) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!db) {
-            db = (0, context_1.getAppDB)();
+            db = backend_core_1.context.getAppDB();
         }
         const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
             include_docs: true,
@@ -25,7 +25,7 @@ function getAllInternalTables(db) {
 }
 function getAllExternalTables(datasourceId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, context_1.getAppDB)();
+        const db = backend_core_1.context.getAppDB();
         const datasource = yield db.get(datasourceId);
         if (!datasource || !datasource.entities) {
             throw "Datasource is not configured fully.";
@@ -41,7 +41,7 @@ function getExternalTable(datasourceId, tableName) {
 }
 function getTable(tableId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, context_1.getAppDB)();
+        const db = backend_core_1.context.getAppDB();
         if ((0, utils_2.isExternalTable)(tableId)) {
             let { datasourceId, tableName } = (0, utils_2.breakExternalTableId)(tableId);
             const datasource = yield db.get(datasourceId);