@budibase/server 2.1.43-alpha.2 → 2.1.43

package/dist/middleware/publicApi.js

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

package/dist/middleware/resourceId.js

@@ -1,6 +1,4 @@
 "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;
@@ -19,7 +17,6 @@ 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();
@@ -34,26 +31,22 @@ class ResourceIdGetter {
         };
     }
 }
-exports.ResourceIdGetter = ResourceIdGetter;
-function paramResource(main) {
+module.exports.ResourceIdGetter = ResourceIdGetter;
+module.exports.paramResource = main => {
     return new ResourceIdGetter("params").mainResource(main).build();
-}
-exports.paramResource = paramResource;
-function paramSubResource(main, sub) {
+};
+module.exports.paramSubResource = (main, sub) => {
     return new ResourceIdGetter("params")
         .mainResource(main)
         .subResource(sub)
         .build();
-}
-exports.paramSubResource = paramSubResource;
-function bodyResource(main) {
+};
+module.exports.bodyResource = main => {
     return new ResourceIdGetter("body").mainResource(main).build();
-}
-exports.bodyResource = bodyResource;
-function bodySubResource(main, sub) {
+};
+module.exports.bodySubResource = (main, sub) => {
     return new ResourceIdGetter("body")
         .mainResource(main)
         .subResource(sub)
         .build();
-}
-exports.bodySubResource = bodySubResource;
+};

package/dist/middleware/selfhost.js

@@ -8,12 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const environment_1 = __importDefault(require("../environment"));
+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
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (environment_1.default.SELF_HOSTED) {
+    if (env.SELF_HOSTED) {
         yield next();
         return;
     }

package/dist/middleware/utils.js

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

package/dist/migrations/functions/appUrls.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const backend_core_1 = require("@budibase/backend-core");
+const { DocumentType } = require("@budibase/backend-core/db");
 const application_1 = require("../../api/controllers/application");
 /**
  * Date:
@@ -22,7 +22,7 @@ const application_1 = require("../../api/controllers/application");
 const run = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
     let metadata;
     try {
-        metadata = yield appDb.get(backend_core_1.db.DocumentType.APP_METADATA);
+        metadata = yield appDb.get(DocumentType.APP_METADATA);
     }
     catch (e) {
         // sometimes the metadata document doesn't exist

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/syncApps.js

@@ -10,15 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const backend_core_1 = require("@budibase/backend-core");
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const db_1 = require("@budibase/backend-core/db");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
     // get app count
-    const devApps = yield backend_core_1.db.getAllApps({ dev: true });
+    const devApps = yield (0, db_1.getAllApps)({ dev: true });
     const appCount = devApps ? devApps.length : 0;
     // sync app count
-    const tenantId = backend_core_1.tenancy.getTenantId();
+    const tenantId = (0, tenancy_1.getTenantId)();
     console.log(`[Tenant: ${tenantId}] Syncing app count: ${appCount}`);
     yield pro_1.quotas.setUsage(appCount, types_1.StaticQuotaName.APPS, types_1.QuotaUsageType.STATIC);
 });

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

@@ -10,13 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const backend_core_1 = require("@budibase/backend-core");
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const db_1 = require("@budibase/backend-core/db");
 const rows_1 = require("../../../utilities/usageQuota/rows");
 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 backend_core_1.db.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
@@ -27,7 +28,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
         rowCount += rows.length;
     });
     // sync row count
-    const tenantId = backend_core_1.tenancy.getTenantId();
+    const tenantId = (0, tenancy_1.getTenantId)();
     console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
     yield pro_1.quotas.setUsagePerApp(counts, types_1.StaticQuotaName.ROWS, types_1.QuotaUsageType.STATIC);
 });

package/dist/migrations/functions/userEmailViewCasing.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const backend_core_1 = require("@budibase/backend-core");
+const { createNewUserEmailView } = require("@budibase/backend-core/db");
 /**
  * Date:
  * October 2021
@@ -18,7 +18,7 @@ const backend_core_1 = require("@budibase/backend-core");
  * Description:
  * Recreate the user email view to include latest changes i.e. lower casing the email address
  */
-const run = () => __awaiter(void 0, void 0, void 0, function* () {
-    yield backend_core_1.db.createNewUserEmailView();
+const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    yield createNewUserEmailView(db);
 });
 exports.run = run;

package/dist/migrations/index.js

@@ -43,7 +43,6 @@ const environment_1 = __importDefault(require("../environment"));
 const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
 const syncQuotas = __importStar(require("./functions/syncQuotas"));
 const appUrls = __importStar(require("./functions/appUrls"));
-const tableSettings = __importStar(require("./functions/tableSettings"));
 const backfill = __importStar(require("./functions/backfill"));
 /**
  * Populate the migration function and additional configuration from
@@ -78,10 +77,6 @@ const buildMigrations = () => {
                 serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: backfill.installation.run, silent: !!environment_1.default.SELF_HOSTED, preventRetry: !!environment_1.default.SELF_HOSTED }));
                 break;
             }
-            case types_1.MigrationName.TABLE_SETTINGS_LINKS_TO_ACTIONS: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { appOpts: { dev: true }, fn: tableSettings.run }));
-                break;
-            }
         }
     }
     return serverMigrations;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.1.43-alpha.1",
+    "version": "2.1.42",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -36,6 +36,40 @@
         "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"
     ],
@@ -43,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.1.43-alpha.1",
-        "@budibase/client": "2.1.43-alpha.1",
-        "@budibase/pro": "2.1.43-alpha.1",
-        "@budibase/string-templates": "2.1.43-alpha.1",
-        "@budibase/types": "2.1.43-alpha.1",
+        "@budibase/backend-core": "^2.1.42",
+        "@budibase/client": "^2.1.42",
+        "@budibase/pro": "2.1.42",
+        "@budibase/string-templates": "^2.1.42",
+        "@budibase/types": "^2.1.42",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -137,7 +171,7 @@
         "@types/oracledb": "5.2.2",
         "@types/pouchdb": "6.4.0",
         "@types/redis": "4.0.11",
-        "@typescript-eslint/parser": "5.45.0",
+        "@typescript-eslint/parser": "5.12.0",
         "apidoc": "0.50.4",
         "babel-jest": "27.5.1",
         "copyfiles": "2.4.1",
@@ -145,7 +179,7 @@
         "eslint": "6.8.0",
         "ioredis-mock": "7.2.0",
         "is-wsl": "2.2.0",
-        "jest": "28.1.1",
+        "jest": "27.5.1",
         "jest-openapi": "0.14.2",
         "nodemon": "2.0.15",
         "openapi-types": "9.3.1",
@@ -156,10 +190,10 @@
         "supertest": "4.0.2",
         "swagger-jsdoc": "6.1.0",
         "timekeeper": "2.2.0",
-        "ts-jest": "28.0.4",
-        "ts-node": "10.8.1",
+        "ts-jest": "27.1.3",
+        "ts-node": "10.5.0",
         "tsconfig-paths": "4.0.0",
-        "typescript": "4.7.3",
+        "typescript": "4.6.2",
         "update-dotenv": "1.1.1"
     },
     "optionalDependencies": {

package/dist/sdk/app/backups/exports.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.streamExportApp = exports.exportMultipleApps = exports.exportApp = exports.exportDB = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const budibaseDir_1 = require("../../../utilities/budibaseDir");
+const utilities_1 = require("../../../utilities/fileSystem/utilities");
 const fileSystem_1 = require("../../../utilities/fileSystem");
 const constants_1 = require("../../../constants");
 const utils_1 = require("../../../db/utils");
@@ -88,7 +89,7 @@ function exportApp(appId, config) {
         // export bucket contents
         let tmpPath;
         if (!environment_1.default.isTest()) {
-            tmpPath = yield backend_core_1.objectStore.retrieveDirectory(constants_1.ObjectStoreBuckets.APPS, appPath);
+            tmpPath = yield (0, utilities_1.retrieveDirectory)(constants_1.ObjectStoreBuckets.APPS, appPath);
         }
         else {
             tmpPath = (0, fileSystem_1.createTempFolder)(uuid());

package/dist/sdk/app/backups/imports.js

@@ -17,6 +17,7 @@ const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
 const budibaseDir_1 = require("../../../utilities/budibaseDir");
 const constants_1 = require("./constants");
+const utilities_1 = require("../../../utilities/fileSystem/utilities");
 const fileSystem_1 = require("../../../utilities/fileSystem");
 const constants_2 = require("../../../constants");
 const path_1 = require("path");
@@ -160,10 +161,10 @@ function importApp(appId, db, template) {
                     }
                     filename = (0, path_1.join)(prodAppId, filename);
                     if (fs_1.default.lstatSync(path).isDirectory()) {
-                        promises.push(backend_core_1.objectStore.uploadDirectory(constants_2.ObjectStoreBuckets.APPS, path, filename));
+                        promises.push((0, utilities_1.uploadDirectory)(constants_2.ObjectStoreBuckets.APPS, path, filename));
                     }
                     else {
-                        promises.push(backend_core_1.objectStore.upload({
+                        promises.push((0, utilities_1.upload)({
                             bucket: constants_2.ObjectStoreBuckets.APPS,
                             path,
                             filename,

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

@@ -9,23 +9,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const backend_core_1 = require("@budibase/backend-core");
+const context_1 = require("@budibase/backend-core/context");
 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 = backend_core_1.context.getAppDB();
+            db = (0, context_1.getAppDB)();
         }
         const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
             include_docs: true,
         }));
-        return internalTables.rows.map((tableDoc) => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: tableDoc.doc.sourceId || utils_1.BudibaseInternalDB._id })));
+        return internalTables.rows.map((tableDoc) => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: utils_1.BudibaseInternalDB._id })));
     });
 }
 function getAllExternalTables(datasourceId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = (0, context_1.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 = backend_core_1.context.getAppDB();
+        const db = (0, context_1.getAppDB)();
         if ((0, utils_2.isExternalTable)(tableId)) {
             let { datasourceId, tableName } = (0, utils_2.breakExternalTableId)(tableId);
             const datasource = yield db.get(datasourceId);

package/dist/startup.js

@@ -37,18 +37,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startup = void 0;
 const env = __importStar(require("./environment"));
-const redis = __importStar(require("./utilities/redis"));
+const redis_1 = __importDefault(require("./utilities/redis"));
 const workerRequests_1 = require("./utilities/workerRequests");
 const backend_core_1 = require("@budibase/backend-core");
 const fs_1 = __importDefault(require("fs"));
 const watch_1 = require("./watch");
-const automations = __importStar(require("./automations"));
-const fileSystem = __importStar(require("./utilities/fileSystem"));
+const automations_1 = __importDefault(require("./automations"));
+const fileSystem_1 = __importDefault(require("./utilities/fileSystem"));
 const events_1 = __importDefault(require("./events"));
 const migrations = __importStar(require("./migrations"));
-const bullboard = __importStar(require("./automations/bullboard"));
+const bullboard_1 = __importDefault(require("./automations/bullboard"));
 const pro = __importStar(require("@budibase/pro"));
-const api = __importStar(require("./api"));
+const api_1 = __importDefault(require("./api"));
 const sdk_1 = __importDefault(require("./sdk"));
 const pino = require("koa-pino-logger");
 let STARTUP_RAN = false;
@@ -56,13 +56,13 @@ function initRoutes(app) {
     return __awaiter(this, void 0, void 0, function* () {
         app.use(pino((0, backend_core_1.pinoSettings)()));
         if (!env.isTest()) {
-            const plugin = yield bullboard.init();
+            const plugin = yield bullboard_1.default.init();
             app.use(plugin);
         }
         app.context.eventEmitter = events_1.default;
         app.context.auth = {};
         // api routes
-        app.use(api.router.routes());
+        app.use(api_1.default.router.routes());
     });
 }
 function initPro() {
@@ -94,8 +94,8 @@ function startup(app, server) {
             env._set("PORT", server.address().port);
         }
         events_1.default.emitPort(env.PORT);
-        fileSystem.init();
-        yield redis.init();
+        fileSystem_1.default.init();
+        yield redis_1.default.init();
         // run migrations on startup if not done via http
         // not recommended in a clustered environment
         if (!env.HTTP_MIGRATIONS && !env.isTest()) {
@@ -141,7 +141,7 @@ function startup(app, server) {
         // get the references to the queue promises, don't await as
         // they will never end, unless the processing stops
         let queuePromises = [];
-        queuePromises.push(automations.init());
+        queuePromises.push(automations_1.default.init());
         queuePromises.push(initPro());
         if (app) {
             // bring routes online as final step once everything ready