@budibase/server 2.0.37 → 2.0.39

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, decodeJSBinding, isJSBinding, encodeJSBinding, } = require("@budibase/string-templates");
+const { 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,25 +81,32 @@ exports.getError = err => {
     return typeof err !== "string" ? err.toString() : err;
 };
 exports.substituteLoopStep = (hbsString, substitute) => {
-    let blocks = [];
     let checkForJS = isJSBinding(hbsString);
+    let substitutedHbsString = "";
+    let open = checkForJS ? `$("` : "{{";
+    let closed = checkForJS ? `")` : "}}";
     if (checkForJS) {
         hbsString = decodeJSBinding(hbsString);
-        blocks.push(hbsString);
     }
-    else {
-        blocks = findHBSBlocks(hbsString);
-    }
-    for (let block of blocks) {
-        block = block.replace(/loop/, substitute);
-        if (checkForJS) {
-            hbsString = encodeJSBinding(block);
-        }
-        else {
-            hbsString = block;
+    let pointer = 0, openPointer = 0, closedPointer = 0;
+    while (pointer < hbsString.length) {
+        openPointer = hbsString.indexOf(open, pointer);
+        closedPointer = hbsString.indexOf(closed, pointer) + 2;
+        if (openPointer < 0 || closedPointer < 0) {
+            substitutedHbsString += hbsString.substring(pointer);
+            break;
         }
+        let before = hbsString.substring(pointer, openPointer);
+        let block = hbsString
+            .substring(openPointer, closedPointer)
+            .replace(/loop/, substitute);
+        substitutedHbsString += before + block;
+        pointer = closedPointer;
+    }
+    if (checkForJS) {
+        substitutedHbsString = encodeJSBinding(substitutedHbsString);
     }
-    return hbsString;
+    return substitutedHbsString;
 };
 exports.stringSplit = value => {
     if (value == null) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.0.36",
+    "version": "2.0.38",
     "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": "^2.0.36",
-        "@budibase/client": "^2.0.36",
-        "@budibase/pro": "2.0.36",
-        "@budibase/string-templates": "^2.0.36",
-        "@budibase/types": "^2.0.36",
+        "@budibase/backend-core": "^2.0.38",
+        "@budibase/client": "^2.0.38",
+        "@budibase/pro": "2.0.38",
+        "@budibase/string-templates": "^2.0.38",
+        "@budibase/types": "^2.0.38",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",