@budibase/server 2.2.12-alpha.4 → 2.2.12-alpha.40

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.3",
+    "version": "2.2.12-alpha.39",
     "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.3",
-        "@budibase/client": "2.2.12-alpha.3",
-        "@budibase/pro": "2.2.12-alpha.3",
-        "@budibase/string-templates": "2.2.12-alpha.3",
-        "@budibase/types": "2.2.12-alpha.3",
+        "@budibase/backend-core": "2.2.12-alpha.39",
+        "@budibase/client": "2.2.12-alpha.39",
+        "@budibase/pro": "2.2.12-alpha.39",
+        "@budibase/string-templates": "2.2.12-alpha.39",
+        "@budibase/types": "2.2.12-alpha.39",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -77,7 +77,7 @@
         "joi": "17.6.0",
         "js-yaml": "4.1.0",
         "jsonschema": "1.4.0",
-        "knex": "0.95.15",
+        "knex": "2.4.0",
         "koa": "2.13.4",
         "koa-body": "4.2.0",
         "koa-compress": "4.0.1",
@@ -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/automation.js

@@ -60,9 +60,13 @@ function getLoopIterations(loopStep, input) {
     if (!loopStep || !binding) {
         return 1;
     }
-    return Array.isArray(binding)
-        ? binding.length
-        : automationUtils.stringSplit(binding).length;
+    if (Array.isArray(binding)) {
+        return binding.length;
+    }
+    if (typeof binding === "string") {
+        return automationUtils.stringSplit(binding).length;
+    }
+    return 1;
 }
 /**
  * The automation orchestrator is a class responsible for executing automations.
@@ -256,12 +260,12 @@ class Orchestrator {
                             loopStep = undefined;
                             break;
                         }
-                        let item;
+                        let item = [];
                         if (typeof loopStep.inputs.binding === "string" &&
                             loopStep.inputs.option === "String") {
                             item = automationUtils.stringSplit(newInput.binding);
                         }
-                        else {
+                        else if (Array.isArray(loopStep.inputs.binding)) {
                             item = loopStep.inputs.binding;
                         }
                         this._context.steps[loopStepNumber] = {

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;