@budibase/server 1.0.151 → 1.0.154

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.150",
+    "version": "1.0.153",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -69,10 +69,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.150",
-        "@budibase/client": "^1.0.150",
-        "@budibase/pro": "1.0.150",
-        "@budibase/string-templates": "^1.0.150",
+        "@budibase/backend-core": "^1.0.153",
+        "@budibase/client": "^1.0.153",
+        "@budibase/pro": "1.0.153",
+        "@budibase/string-templates": "^1.0.153",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/automation.js

@@ -18,13 +18,46 @@ const { DocumentTypes } = require("../db/utils");
 const { doInTenant } = require("@budibase/backend-core/tenancy");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
-const { AutomationErrors } = require("../constants");
+const { AutomationErrors, LoopStepTypes } = require("../constants");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerDefs.CRON.stepId;
 const STOPPED_STATUS = { success: false, status: "STOPPED" };
 const { cloneDeep } = require("lodash/fp");
 const env = require("../environment");
+function typecastForLooping(loopStep, input) {
+    if (!input || !input.binding) {
+        return null;
+    }
+    const isArray = Array.isArray(input.binding), isString = typeof input.binding === "string";
+    try {
+        switch (loopStep.inputs.option) {
+            case LoopStepTypes.ARRAY:
+                if (isString) {
+                    return JSON.parse(input.binding);
+                }
+                break;
+            case LoopStepTypes.STRING:
+                if (isArray) {
+                    return input.binding.join(",");
+                }
+                break;
+        }
+    }
+    catch (err) {
+        throw new Error("Unable to cast to correct type");
+    }
+    return input.binding;
+}
+function getLoopIterations(loopStep, input) {
+    const binding = typecastForLooping(loopStep, input);
+    if (!loopStep || !binding) {
+        return 1;
+    }
+    return Array.isArray(binding)
+        ? binding.length
+        : automationUtils.stringSplit(binding).length;
+}
 /**
  * The automation orchestrator is a class responsible for executing automations.
  * It handles the context of the automation and makes sure each step gets the correct
@@ -95,7 +128,7 @@ class Orchestrator {
         this._context.steps.splice(loopStepNumber, 0, Object.assign(Object.assign({}, output), { success: result.success, status: result.status }));
     }
     execute() {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let automation = this._automation;
             const app = yield this.getApp();
@@ -106,7 +139,7 @@ class Orchestrator {
             let loopSteps = [];
             for (let step of automation.definition.steps) {
                 stepCount++;
-                let input;
+                let input, iterations = 1, iterationCount = 0;
                 if (step.stepId === LOOP_STEP_ID) {
                     loopStep = step;
                     loopStepNumber = stepCount;
@@ -114,24 +147,18 @@ class Orchestrator {
                 }
                 if (loopStep) {
                     input = yield processObject(loopStep.inputs, this._context);
+                    iterations = getLoopIterations(loopStep, input);
                 }
-                let iterations = loopStep
-                    ? Array.isArray(input.binding)
-                        ? input.binding.length
-                        : automationUtils.stringSplit(input.binding).length
-                    : 1;
-                let iterationCount = 0;
                 for (let index = 0; index < iterations; index++) {
                     let originalStepInput = cloneDeep(step.inputs);
                     // Handle if the user has set a max iteration count or if it reaches the max limit set by us
                     if (loopStep) {
                         let newInput = yield processObject(loopStep.inputs, cloneDeep(this._context));
-                        newInput = automationUtils.cleanInputValues(newInput, loopStep.schema.inputs);
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
-                        if ((loopStep.inputs.option === "Array" &&
-                            !Array.isArray(newInput.binding)) ||
-                            (loopStep.inputs.option === "String" &&
-                                typeof newInput.binding !== "string")) {
+                        try {
+                            newInput.binding = typecastForLooping(loopStep, newInput);
+                        }
+                        catch (err) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: AutomationErrors.INCORRECT_TYPE,
                                 success: false,
@@ -179,16 +206,14 @@ class Orchestrator {
                             break;
                         }
                         let isFailure = false;
-                        if (typeof ((_a = this._context.steps[loopStepNumber]) === null || _a === void 0 ? void 0 : _a.currentItem) === "object") {
-                            isFailure = Object.keys(this._context.steps[loopStepNumber].currentItem).some(value => {
-                                return (this._context.steps[loopStepNumber].currentItem[value] ===
-                                    loopStep.inputs.failure);
+                        const currentItem = (_a = this._context.steps[loopStepNumber]) === null || _a === void 0 ? void 0 : _a.currentItem;
+                        if (currentItem && typeof currentItem === "object") {
+                            isFailure = Object.keys(currentItem).some(value => {
+                                return currentItem[value] === loopStep.inputs.failure;
                             });
                         }
                         else {
-                            isFailure =
-                                ((_b = this._context.steps[loopStepNumber]) === null || _b === void 0 ? void 0 : _b.currentItem) ===
-                                    loopStep.inputs.failure;
+                            isFailure = currentItem && currentItem === loopStep.inputs.failure;
                         }
                         if (isFailure) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {