@budibase/server 1.0.136 → 1.0.139

package/dist/threads/automation.js

@@ -100,9 +100,9 @@ class Orchestrator {
             let automation = this._automation;
             const app = yield this.getApp();
             let stopped = false;
-            let loopStep;
+            let loopStep = null;
             let stepCount = 0;
-            let loopStepNumber;
+            let loopStepNumber = null;
             let loopSteps = [];
             for (let step of automation.definition.steps) {
                 stepCount++;
@@ -115,19 +115,18 @@ class Orchestrator {
                 if (loopStep) {
                     input = yield processObject(loopStep.inputs, this._context);
                 }
-                let iterations = loopStep ? input.binding.length : 1;
+                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) {
-                        // lets first of all handle the input
-                        // if the input is array then use it, if it is a string then split it on every new line
                         let newInput = yield processObject(loopStep.inputs, cloneDeep(this._context));
                         newInput = automationUtils.cleanInputValues(newInput, loopStep.schema.inputs);
-                        this._context.steps[loopStepNumber] = {
-                            currentItem: newInput.binding[index],
-                        };
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
                         if ((loopStep.inputs.option === "Array" &&
                             !Array.isArray(newInput.binding)) ||
@@ -141,6 +140,17 @@ class Orchestrator {
                             loopStep = null;
                             break;
                         }
+                        let item;
+                        if (typeof loopStep.inputs.binding === "string" &&
+                            loopStep.inputs.option === "String") {
+                            item = automationUtils.stringSplit(newInput.binding);
+                        }
+                        else {
+                            item = loopStep.inputs.binding;
+                        }
+                        this._context.steps[loopStepNumber] = {
+                            currentItem: item[index],
+                        };
                         // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it
                         // Pretty hacky because we need to account for the row object
                         for (let [key, value] of Object.entries(originalStepInput)) {
@@ -249,15 +259,14 @@ class Orchestrator {
 }
 module.exports = (input, callback) => {
     const appId = input.data.event.appId;
-    doInAppContext(appId, () => {
+    doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event);
-        automationOrchestrator
-            .execute()
-            .then(response => {
+        try {
+            const response = yield automationOrchestrator.execute();
             callback(null, response);
-        })
-            .catch(err => {
+        }
+        catch (err) {
             callback(err);
-        });
-    });
+        }
+    }));
 };

package/dist/threads/query.js

@@ -178,14 +178,14 @@ class QueryRunner {
     }
 }
 module.exports = (input, callback) => {
-    doInAppContext(input.appId, () => {
+    doInAppContext(input.appId, () => __awaiter(void 0, void 0, void 0, function* () {
         const Runner = new QueryRunner(input);
-        Runner.execute()
-            .then(response => {
+        try {
+            const response = yield Runner.execute();
             callback(null, response);
-        })
-            .catch(err => {
+        }
+        catch (err) {
             callback(err);
-        });
-    });
+        }
+    }));
 };