@budibase/server 2.2.12-alpha.5 → 2.2.12-alpha.6

package/dist/automations/logging/index.js

@@ -1,27 +1,4 @@
 "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) {
@@ -31,15 +8,18 @@ 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 };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAppMetadata = exports.storeLog = void 0;
-const env = __importStar(require("../../environment"));
+const environment_1 = __importDefault(require("../../environment"));
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
 function storeLog(automation, results) {
     return __awaiter(this, void 0, void 0, function* () {
         // can disable this if un-needed in self-host, also only do this for prod apps
-        if (env.DISABLE_AUTOMATION_LOGS) {
+        if (environment_1.default.DISABLE_AUTOMATION_LOGS) {
             return;
         }
         yield pro_1.automations.logs.storeLog(automation, results);

package/dist/db/index.js

@@ -1,14 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 const backend_core_1 = require("@budibase/backend-core");
-const env = require("../environment");
+const environment_1 = __importDefault(require("../environment"));
 function init() {
     const dbConfig = {
         replication: true,
         find: true,
     };
-    if (env.isTest() && !env.COUCH_DB_URL) {
+    if (environment_1.default.isTest() && !environment_1.default.COUCH_DB_URL) {
         dbConfig.inMemory = true;
         dbConfig.allDbs = true;
     }

package/dist/db/linkedRows/LinkController.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const linkUtils_1 = require("./linkUtils");
 const utils_1 = require("../utils");
 const node_1 = __importDefault(require("@sentry/node"));
@@ -387,4 +388,4 @@ class LinkController {
         });
     }
 }
-module.exports = LinkController;
+exports.default = LinkController;

package/dist/db/linkedRows/LinkDocument.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const constants_1 = require("../../constants");
 /**
@@ -29,4 +30,4 @@ class LinkDocumentImpl {
         };
     }
 }
-module.exports = LinkDocumentImpl;
+exports.default = LinkDocumentImpl;

package/dist/db/newid.js

@@ -1,5 +1,7 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const { v4 } = require("uuid");
-module.exports = function () {
+function default_1() {
     return v4().replace(/-/g, "");
-};
+}
+exports.default = default_1;

package/dist/environment.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 function isTest() {
     return isCypress() || isJest();
@@ -112,4 +113,4 @@ for (let [key, value] of Object.entries(environment)) {
         environment[key] = 0;
     }
 }
-module.exports = environment;
+exports.default = environment;

package/dist/events/AutomationEmitter.js

@@ -2,6 +2,7 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("./utils");
 const index_1 = __importDefault(require("./index"));
 const environment_1 = __importDefault(require("../environment"));
@@ -49,4 +50,4 @@ class AutomationEmitter {
         });
     }
 }
-module.exports = AutomationEmitter;
+exports.default = AutomationEmitter;

package/dist/events/BudibaseEmitter.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = require("events");
 const utils_1 = require("./utils");
 /**
@@ -21,4 +22,4 @@ class BudibaseEmitter extends events_1.EventEmitter {
         this.emit("internal:port", portNumber);
     }
 }
-module.exports = BudibaseEmitter;
+exports.default = BudibaseEmitter;

package/dist/events/index.js

@@ -2,6 +2,7 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const BudibaseEmitter_1 = __importDefault(require("./BudibaseEmitter"));
 const emitter = new BudibaseEmitter_1.default();
-module.exports = emitter;
+exports.default = emitter;

package/dist/middleware/authorized.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const backend_core_1 = require("@budibase/backend-core");
 const builder_1 = __importDefault(require("./builder"));
 const utils_1 = require("./utils");
@@ -56,7 +57,7 @@ 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* () {
+exports.default = (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 ((0, utils_1.isWebhookEndpoint)(ctx) || ctx.internal) {

package/dist/middleware/builder.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../db/utils");
 const redis_1 = require("../utilities/redis");
 const backend_core_1 = require("@budibase/backend-core");
@@ -60,7 +61,7 @@ function updateAppUpdatedAt(ctx) {
         }));
     });
 }
-module.exports = function builder(ctx, permType) {
+function builder(ctx, permType) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         // this only functions within an app context
@@ -85,4 +86,5 @@ module.exports = function builder(ctx, permType) {
         // set updated at time on app
         yield updateAppUpdatedAt(ctx);
     });
-};
+}
+exports.default = builder;

package/dist/middleware/currentapp.js

@@ -11,12 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 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* () {
+exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // try to get the appID from the request
     let requestAppId = yield backend_core_1.utils.getAppIdFromCtx(ctx);
     // get app cookie if it exists

package/dist/middleware/publicApi.js

@@ -8,8 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const backend_core_1 = require("@budibase/backend-core");
-module.exports = function ({ requiresAppId } = {}) {
+function default_1({ requiresAppId } = {}) {
     return (ctx, next) => __awaiter(this, void 0, void 0, function* () {
         const appId = yield backend_core_1.utils.getAppIdFromCtx(ctx);
         if (requiresAppId && !appId) {
@@ -20,4 +21,5 @@ module.exports = function ({ requiresAppId } = {}) {
         }
         return next();
     });
-};
+}
+exports.default = default_1;

package/dist/middleware/selfhost.js

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

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.12-alpha.4",
+    "version": "2.2.12-alpha.5",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.2.12-alpha.4",
-        "@budibase/client": "2.2.12-alpha.4",
-        "@budibase/pro": "2.2.12-alpha.4",
-        "@budibase/string-templates": "2.2.12-alpha.4",
-        "@budibase/types": "2.2.12-alpha.4",
+        "@budibase/backend-core": "2.2.12-alpha.5",
+        "@budibase/client": "2.2.12-alpha.5",
+        "@budibase/pro": "2.2.12-alpha.5",
+        "@budibase/string-templates": "2.2.12-alpha.5",
+        "@budibase/types": "2.2.12-alpha.5",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -123,6 +123,8 @@
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
         "@jest/test-sequencer": "24.9.0",
+        "@swc/core": "^1.3.25",
+        "@swc/jest": "^0.2.24",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",
         "@types/global-agent": "2.1.1",

package/dist/startup.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startup = void 0;
-const env = __importStar(require("./environment"));
+const environment_1 = __importDefault(require("./environment"));
 const redis = __importStar(require("./utilities/redis"));
 const workerRequests_1 = require("./utilities/workerRequests");
 const backend_core_1 = require("@budibase/backend-core");
@@ -54,8 +54,8 @@ const pino = require("koa-pino-logger");
 let STARTUP_RAN = false;
 function initRoutes(app) {
     return __awaiter(this, void 0, void 0, function* () {
-        app.use(pino((0, backend_core_1.pinoSettings)()));
-        if (!env.isTest()) {
+        app.use(pino(backend_core_1.logging.pinoSettings()));
+        if (!environment_1.default.isTest()) {
             const plugin = yield bullboard.init();
             app.use(plugin);
         }
@@ -91,14 +91,14 @@ function startup(app, server) {
         STARTUP_RAN = true;
         if (server) {
             console.log(`Budibase running on ${JSON.stringify(server.address())}`);
-            env._set("PORT", server.address().port);
+            environment_1.default._set("PORT", server.address().port);
         }
-        events_1.default.emitPort(env.PORT);
+        events_1.default.emitPort(environment_1.default.PORT);
         fileSystem.init();
         yield redis.init();
         // run migrations on startup if not done via http
         // not recommended in a clustered environment
-        if (!env.HTTP_MIGRATIONS && !env.isTest()) {
+        if (!environment_1.default.HTTP_MIGRATIONS && !environment_1.default.isTest()) {
             try {
                 yield migrations.migrate();
             }
@@ -108,20 +108,20 @@ function startup(app, server) {
             }
         }
         // check and create admin user if required
-        if (env.SELF_HOSTED &&
-            !env.MULTI_TENANCY &&
-            env.BB_ADMIN_USER_EMAIL &&
-            env.BB_ADMIN_USER_PASSWORD) {
+        if (environment_1.default.SELF_HOSTED &&
+            !environment_1.default.MULTI_TENANCY &&
+            environment_1.default.BB_ADMIN_USER_EMAIL &&
+            environment_1.default.BB_ADMIN_USER_PASSWORD) {
             const checklist = yield (0, workerRequests_1.getChecklist)();
             if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
                 try {
                     const tenantId = backend_core_1.tenancy.getTenantId();
-                    const user = yield (0, workerRequests_1.createAdminUser)(env.BB_ADMIN_USER_EMAIL, env.BB_ADMIN_USER_PASSWORD, tenantId);
+                    const user = yield (0, workerRequests_1.createAdminUser)(environment_1.default.BB_ADMIN_USER_EMAIL, environment_1.default.BB_ADMIN_USER_PASSWORD, tenantId);
                     // Need to set up an API key for automated integration tests
-                    if (env.isTest()) {
+                    if (environment_1.default.isTest()) {
                         yield (0, workerRequests_1.generateApiKey)(user._id);
                     }
-                    console.log("Admin account automatically created for", env.BB_ADMIN_USER_EMAIL);
+                    console.log("Admin account automatically created for", environment_1.default.BB_ADMIN_USER_EMAIL);
                 }
                 catch (e) {
                     backend_core_1.logging.logAlert("Error creating initial admin user. Exiting.", e);
@@ -130,10 +130,10 @@ function startup(app, server) {
             }
         }
         // monitor plugin directory if required
-        if (env.SELF_HOSTED &&
-            !env.MULTI_TENANCY &&
-            env.PLUGINS_DIR &&
-            fs_1.default.existsSync(env.PLUGINS_DIR)) {
+        if (environment_1.default.SELF_HOSTED &&
+            !environment_1.default.MULTI_TENANCY &&
+            environment_1.default.PLUGINS_DIR &&
+            fs_1.default.existsSync(environment_1.default.PLUGINS_DIR)) {
             (0, watch_1.watch)();
         }
         // check for version updates

package/dist/threads/index.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (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"));
+const environment_1 = __importDefault(require("../environment"));
 exports.ThreadType = {
     QUERY: "query",
     AUTOMATION: "automation",
@@ -76,10 +76,10 @@ class Thread {
         }
     }
     shouldDisableThreading() {
-        return !!(env.isTest() ||
-            env.DISABLE_THREADING ||
+        return !!(environment_1.default.isTest() ||
+            environment_1.default.DISABLE_THREADING ||
             this.count === 0 ||
-            env.isInThread());
+            environment_1.default.isInThread());
     }
     run(data) {
         const timeout = this.timeoutMs;