@budibase/server 1.0.212-alpha.1 → 1.0.212-alpha.2

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Jun 28 2022 12:23:57 GMT+0000 (Coordinated Universal Time)
+                at Tue Jun 28 2022 13:54:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -487,7 +487,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Jun 28 2022 12:23:57 GMT+0000 (Coordinated Universal Time)
+                at Tue Jun 28 2022 13:54:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -4417,11 +4417,11 @@ BRH:1
 end_of_record
 TN:
 SF:src/automations/automationUtils.js
-FN:20,(anonymous_0)
-FN:61,(anonymous_1)
-FN:66,(anonymous_2)
-FN:79,(anonymous_3)
-FN:90,(anonymous_4)
+FN:25,(anonymous_0)
+FN:66,(anonymous_1)
+FN:71,(anonymous_2)
+FN:84,(anonymous_3)
+FN:105,(anonymous_4)
 FNF:5
 FNH:3
 FNDA:14,(anonymous_0)
@@ -4430,83 +4430,93 @@ FNDA:3,(anonymous_2)
 FNDA:0,(anonymous_3)
 FNDA:0,(anonymous_4)
 DA:1,44
-DA:2,44
-DA:20,44
-DA:21,14
-DA:22,1
-DA:24,13
-DA:25,33
-DA:26,33
-DA:27,6
-DA:29,27
-DA:30,27
-DA:31,11
-DA:33,16
-DA:34,2
-DA:35,2
-DA:36,1
-DA:38,2
-DA:39,1
-DA:42,16
-DA:43,1
+DA:7,44
+DA:25,44
+DA:26,14
+DA:27,1
+DA:29,13
+DA:30,33
+DA:31,33
+DA:32,6
+DA:34,27
+DA:35,27
+DA:36,11
+DA:38,16
+DA:39,2
+DA:40,2
+DA:41,1
+DA:43,2
 DA:44,1
-DA:45,1
-DA:49,13
-DA:61,44
-DA:62,8
-DA:63,7
+DA:47,16
+DA:48,1
+DA:49,1
+DA:50,1
+DA:54,13
 DA:66,44
-DA:67,3
-DA:68,0
-DA:70,3
-DA:74,0
-DA:76,3
-DA:79,44
-DA:80,0
-DA:81,0
-DA:82,0
-DA:83,0
-DA:84,0
+DA:67,8
+DA:68,7
+DA:71,44
+DA:72,3
+DA:73,0
+DA:75,3
+DA:79,0
+DA:81,3
+DA:84,44
+DA:85,0
+DA:86,0
 DA:87,0
-DA:90,44
+DA:88,0
+DA:89,0
 DA:91,0
-DA:92,0
+DA:93,0
 DA:94,0
 DA:95,0
-DA:97,0
-DA:99,0
-LF:46
+DA:96,0
+DA:98,0
+DA:102,0
+DA:105,44
+DA:106,0
+DA:107,0
+DA:109,0
+DA:110,0
+DA:112,0
+DA:114,0
+LF:52
 LH:32
-BRDA:21,0,0,1
-BRDA:21,0,1,13
-BRDA:26,1,0,6
-BRDA:26,1,1,27
-BRDA:30,2,0,11
-BRDA:30,2,1,16
-BRDA:33,3,0,2
-BRDA:33,3,1,14
-BRDA:35,4,0,1
-BRDA:35,4,1,1
-BRDA:38,5,0,1
-BRDA:38,5,1,1
-BRDA:42,6,0,1
-BRDA:42,6,1,15
-BRDA:44,7,0,1
-BRDA:44,7,1,0
-BRDA:67,8,0,0
-BRDA:67,8,1,3
-BRDA:70,9,0,0
-BRDA:70,9,1,3
-BRDA:71,10,0,3
-BRDA:71,10,1,3
-BRDA:71,10,2,3
-BRDA:76,11,0,3
-BRDA:76,11,1,0
-BRDA:91,12,0,0
-BRDA:91,12,1,0
-BRDA:94,13,0,0
-BRDA:94,13,1,0
-BRF:29
+BRDA:26,0,0,1
+BRDA:26,0,1,13
+BRDA:31,1,0,6
+BRDA:31,1,1,27
+BRDA:35,2,0,11
+BRDA:35,2,1,16
+BRDA:38,3,0,2
+BRDA:38,3,1,14
+BRDA:40,4,0,1
+BRDA:40,4,1,1
+BRDA:43,5,0,1
+BRDA:43,5,1,1
+BRDA:47,6,0,1
+BRDA:47,6,1,15
+BRDA:49,7,0,1
+BRDA:49,7,1,0
+BRDA:72,8,0,0
+BRDA:72,8,1,3
+BRDA:75,9,0,0
+BRDA:75,9,1,3
+BRDA:76,10,0,3
+BRDA:76,10,1,3
+BRDA:76,10,2,3
+BRDA:81,11,0,3
+BRDA:81,11,1,0
+BRDA:87,12,0,0
+BRDA:87,12,1,0
+BRDA:95,13,0,0
+BRDA:95,13,1,0
+BRDA:106,14,0,0
+BRDA:106,14,1,0
+BRDA:109,15,0,0
+BRDA:109,15,1,0
+BRF:33
 BRH:21
 end_of_record
 TN:

package/dist/automations/automationUtils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getTable } = require("../api/controllers/table/utils");
-const { findHBSBlocks } = require("@budibase/string-templates");
+const { findHBSBlocks, decodeJSBinding, isJSBinding, encodeJSBinding, } = require("@budibase/string-templates");
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -81,11 +81,23 @@ exports.getError = err => {
     return typeof err !== "string" ? err.toString() : err;
 };
 exports.substituteLoopStep = (hbsString, substitute) => {
-    let blocks = findHBSBlocks(hbsString);
+    let blocks = [];
+    let checkForJS = isJSBinding(hbsString);
+    if (checkForJS) {
+        hbsString = decodeJSBinding(hbsString);
+        blocks.push(hbsString);
+    }
+    else {
+        blocks = findHBSBlocks(hbsString);
+    }
     for (let block of blocks) {
-        let oldBlock = block;
         block = block.replace(/loop/, substitute);
-        hbsString = hbsString.replace(new RegExp(oldBlock, "g"), block);
+        if (checkForJS) {
+            hbsString = encodeJSBinding(block);
+        }
+        else {
+            hbsString = block;
+        }
     }
     return hbsString;
 };

package/dist/environment.js

@@ -56,7 +56,7 @@ module.exports = {
     SALT_ROUNDS: process.env.SALT_ROUNDS,
     LOGGER: process.env.LOGGER,
     LOG_LEVEL: process.env.LOG_LEVEL,
-    AUTOMATION_MAX_ITERATIONS: process.env.AUTOMATION_MAX_ITERATIONS,
+    AUTOMATION_MAX_ITERATIONS: parseIntSafe(process.env.AUTOMATION_MAX_ITERATIONS) || 200,
     SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
     DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
     QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),

package/dist/package.json

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

package/dist/threads/automation.js

@@ -195,7 +195,7 @@ class Orchestrator {
                                 }
                             }
                         }
-                        if (index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
+                        if (index === env.AUTOMATION_MAX_ITERATION ||
                             index === parseInt(loopStep.inputs.iterations)) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: AutomationErrors.MAX_ITERATIONS,