From 00fda6af4127263a04a1558da9ef5648d4f1fb68 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 18 Jan 2024 16:38:34 +0000
Subject: [PATCH 01/32] update emitter to account for a new chaining property

---
 .../server/src/events/AutomationEmitter.ts    | 37 ++++++++++++-------
 packages/types/src/documents/app/app.ts       |  6 +++
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/packages/server/src/events/AutomationEmitter.ts b/packages/server/src/events/AutomationEmitter.ts
index 9d476d5088..3297fc7263 100644
--- a/packages/server/src/events/AutomationEmitter.ts
+++ b/packages/server/src/events/AutomationEmitter.ts
@@ -1,18 +1,9 @@
 import { rowEmission, tableEmission } from "./utils"
 import mainEmitter from "./index"
 import env from "../environment"
-import { Table, Row } from "@budibase/types"
+import { Table, Row, DocumentType, App } from "@budibase/types"
+import { context } from "@budibase/backend-core"
 
-// max number of automations that can chain on top of each other
-// TODO: in future make this configurable at the automation level
-const MAX_AUTOMATION_CHAIN = env.SELF_HOSTED ? 5 : 0
-
-/**
- * Special emitter which takes the count of automation runs which have occurred and blocks an
- * automation from running if it has reached the maximum number of chained automations runs.
- * This essentially "fakes" the normal emitter to add some functionality in-between to stop automations
- * from getting stuck endlessly chaining.
- */
 class AutomationEmitter {
   chainCount: number
   metadata: { automationChainCount: number }
@@ -24,7 +15,23 @@ class AutomationEmitter {
     }
   }
 
-  emitRow(eventName: string, appId: string, row: Row, table?: Table) {
+  async getMaxAutomationChain() {
+    const db = context.getAppDB()
+    const appMetadata = await db.get<App>(DocumentType.APP_METADATA)
+    let chainAutomations = appMetadata?.automations?.chainAutomations
+
+    if (chainAutomations === true) {
+      return 5
+    } else if (chainAutomations === undefined && env.SELF_HOSTED) {
+      return 5
+    } else {
+      return 0
+    }
+  }
+
+  async emitRow(eventName: string, appId: string, row: Row, table?: Table) {
+    let MAX_AUTOMATION_CHAIN = await this.getMaxAutomationChain()
+
     // don't emit even if we've reached max automation chain
     if (this.chainCount >= MAX_AUTOMATION_CHAIN) {
       return
@@ -39,9 +46,11 @@ class AutomationEmitter {
     })
   }
 
-  emitTable(eventName: string, appId: string, table?: Table) {
+  async emitTable(eventName: string, appId: string, table?: Table) {
+    let MAX_AUTOMATION_CHAIN = await this.getMaxAutomationChain()
+
     // don't emit even if we've reached max automation chain
-    if (this.chainCount > MAX_AUTOMATION_CHAIN) {
+    if (this.chainCount >= MAX_AUTOMATION_CHAIN) {
       return
     }
 
diff --git a/packages/types/src/documents/app/app.ts b/packages/types/src/documents/app/app.ts
index 5bbdd86515..e1174d4fe4 100644
--- a/packages/types/src/documents/app/app.ts
+++ b/packages/types/src/documents/app/app.ts
@@ -23,6 +23,7 @@ export interface App extends Document {
   automationErrors?: AppMetadataErrors
   icon?: AppIcon
   features?: AppFeatures
+  automations: AutomationSettings
 }
 
 export interface AppInstance {
@@ -67,4 +68,9 @@ export interface AppIcon {
 export interface AppFeatures {
   componentValidation?: boolean
   disableUserMetadata?: boolean
+  enableAutomationChaining?: boolean
+}
+
+export interface AutomationSettings {
+  chainAutomations?: boolean
 }

From b05484bb49c6f941ec57eff3525b5bebe049c24c Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 18 Jan 2024 16:38:51 +0000
Subject: [PATCH 02/32] frontend toggle for new automation chaining and update
 settings ux

---
 .../src/builderStore/store/frontend.js        |  1 +
 .../components/start/ChooseIconModal.svelte   |  1 +
 .../settings/automation-history/index.svelte  | 46 +++++++++++++++++--
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index b05b127b1c..af48afb1bc 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -65,6 +65,7 @@ const INITIAL_FRONTEND_STATE = {
   features: {
     componentValidation: false,
     disableUserMetadata: false,
+    enableAutomationChaining: false,
   },
   errors: [],
   hasAppPackage: false,
diff --git a/packages/builder/src/components/start/ChooseIconModal.svelte b/packages/builder/src/components/start/ChooseIconModal.svelte
index 1ffaa35e34..1f26cb93ec 100644
--- a/packages/builder/src/components/start/ChooseIconModal.svelte
+++ b/packages/builder/src/components/start/ChooseIconModal.svelte
@@ -49,6 +49,7 @@
       return
     }
     try {
+      console.log(app.instance._id)
       await apps.update(app.instance._id, {
         icon: { name, color },
       })
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
index 373a47aa2e..4ff3409b09 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
@@ -8,6 +8,8 @@
     Body,
     Heading,
     Divider,
+    Toggle,
+    notifications,
   } from "@budibase/bbui"
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import StatusRenderer from "./_components/StatusRenderer.svelte"
@@ -16,7 +18,7 @@
   import { createPaginationStore } from "helpers/pagination"
   import { getContext, onDestroy, onMount } from "svelte"
   import dayjs from "dayjs"
-  import { auth, licensing, admin } from "stores/portal"
+  import { auth, licensing, admin, apps } from "stores/portal"
   import { Constants } from "@budibase/frontend-core"
   import Portal from "svelte-portal"
 
@@ -35,9 +37,13 @@
   let timeRange = null
   let loaded = false
 
+  $: app = $apps.find(app => app.devId === $store.appId)
   $: licensePlan = $auth.user?.license?.plan
   $: page = $pageInfo.page
   $: fetchLogs(automationId, status, page, timeRange)
+  $: isCloud = $admin.cloud
+
+  $: chainAutomations = app?.automations?.chainAutomations ?? !isCloud
 
   const timeOptions = [
     { value: "90-d", label: "Past 90 days" },
@@ -124,6 +130,18 @@
     sidePanel.open()
   }
 
+  async function save({ detail }) {
+    try {
+      await apps.update($store.appId, {
+        automations: {
+          chainAutomations: detail,
+        },
+      })
+    } catch (error) {
+      notifications.error("Error updating automation chaining setting")
+    }
+  }
+
   onMount(async () => {
     await automationStore.actions.fetch()
     const params = new URLSearchParams(window.location.search)
@@ -150,11 +168,30 @@
 
 <Layout noPadding>
   <Layout gap="XS" noPadding>
-    <Heading>Automation History</Heading>
-    <Body>View the automations your app has executed</Body>
+    <Heading>Automations</Heading>
+    <Body>See your automation history and edit advanced settings</Body>
   </Layout>
   <Divider />
 
+  <Layout gap="XS" noPadding>
+    <Heading size="XS">Chain automations</Heading>
+    <Body>Allow automations to trigger from other automations</Body>
+    <div class="setting-spacing">
+      <Toggle
+        text={"Enable chaining"}
+        on:change={e => {
+          save(e)
+        }}
+        value={chainAutomations}
+      />
+    </div>
+  </Layout>
+
+  <Divider />
+  <Layout gap="XS" noPadding>
+    <Heading size="XS">History</Heading>
+    <Body>Free plan stores up to 1 day of automation history</Body>
+  </Layout>
   <div class="controls">
     <div class="search">
       <div class="select">
@@ -237,6 +274,9 @@
 {/if}
 
 <style>
+  .setting-spacing {
+    padding-top: var(--spacing-s);
+  }
   .controls {
     display: flex;
     flex-direction: row;

From 242dd3ea52e644f827f98f29803c26177e163eee Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 19 Jan 2024 16:04:44 +0000
Subject: [PATCH 03/32] ux tweaks to new automations setting page

---
 .../pages/builder/app/[application]/settings/_layout.svelte | 6 +++---
 .../_components/HistoryDetailsPanel.svelte                  | 0
 .../_components/StatusRenderer.svelte                       | 0
 .../{automation-history => automations}/index.svelte        | 6 +++---
 .../pages/builder/app/[application]/settings/index.svelte   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename packages/builder/src/pages/builder/app/[application]/settings/{automation-history => automations}/_components/HistoryDetailsPanel.svelte (100%)
 rename packages/builder/src/pages/builder/app/[application]/settings/{automation-history => automations}/_components/StatusRenderer.svelte (100%)
 rename packages/builder/src/pages/builder/app/[application]/settings/{automation-history => automations}/index.svelte (97%)

diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
index 899b58ecf0..65a13f0bd9 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
@@ -15,9 +15,9 @@
       <Content showMobileNav>
         <SideNav slot="side-nav">
           <SideNavItem
-            text="Automation History"
-            url={$url("./automation-history")}
-            active={$isActive("./automation-history")}
+            text="Automations"
+            url={$url("./automations")}
+            active={$isActive("./automations")}
           />
           <SideNavItem
             text="Backups"
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
rename to packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/StatusRenderer.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
rename to packages/builder/src/pages/builder/app/[application]/settings/automations/_components/StatusRenderer.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
similarity index 97%
rename from packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
rename to packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
index 4ff3409b09..603f83a7dd 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
@@ -169,13 +169,13 @@
 <Layout noPadding>
   <Layout gap="XS" noPadding>
     <Heading>Automations</Heading>
-    <Body>See your automation history and edit advanced settings</Body>
+    <Body size="S">See your automation history and edit advanced settings</Body>
   </Layout>
   <Divider />
 
   <Layout gap="XS" noPadding>
     <Heading size="XS">Chain automations</Heading>
-    <Body>Allow automations to trigger from other automations</Body>
+    <Body size="S">Allow automations to trigger from other automations</Body>
     <div class="setting-spacing">
       <Toggle
         text={"Enable chaining"}
@@ -190,7 +190,7 @@
   <Divider />
   <Layout gap="XS" noPadding>
     <Heading size="XS">History</Heading>
-    <Body>Free plan stores up to 1 day of automation history</Body>
+    <Body size="S">Free plan stores up to 1 day of automation history</Body>
   </Layout>
   <div class="controls">
     <div class="search">
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte
index 501d34b12e..1c763724a1 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte
@@ -1,5 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
 
-  $redirect("../settings/automation-history")
+  $redirect("../settings/automations")
 </script>

From 3ab791710cc60b4ff3aec77c2c06a81869ef1a18 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 22 Jan 2024 09:40:56 +0000
Subject: [PATCH 04/32] fix issue where readable binding wasn't working
 correctly with named steps

---
 .../automation/SetupPanel/AutomationBlockSetup.svelte          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index a5a3165aeb..2f9907794e 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -184,7 +184,8 @@
       }
 
       if (
-        (idx === 0 && automation.trigger?.event === "row:update") ||
+        idx === 0 &&
+        automation.trigger?.event === "row:update" &&
         automation.trigger?.event === "row:save"
       ) {
         if (name !== "id" && name !== "revision") return `trigger.row.${name}`

From 2a24c8537857af19c99ceb48fe111c814a8f29c6 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Mon, 22 Jan 2024 15:30:21 +0000
Subject: [PATCH 05/32] Surface email error (#12837)

---
 packages/server/src/utilities/workerRequests.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/server/src/utilities/workerRequests.ts b/packages/server/src/utilities/workerRequests.ts
index 56ceff226c..1604a724d2 100644
--- a/packages/server/src/utilities/workerRequests.ts
+++ b/packages/server/src/utilities/workerRequests.ts
@@ -48,6 +48,9 @@ async function checkResponse(
     let error
     try {
       error = await response.json()
+      if (!error.message) {
+        error = JSON.stringify(error)
+      }
     } catch (err) {
       error = await response.text()
     }

From 6e86f3e27158e55168a063b6f8ef5bc89f298280 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 22 Jan 2024 15:32:13 +0000
Subject: [PATCH 06/32] Bump version to 2.15.4

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 6663aebfe6..480b577bb4 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.15.3",
+  "version": "2.15.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From 3f9d1402f31ca5f640d007dcd4b1963ee1b84f5c Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 23 Jan 2024 09:21:04 +0000
Subject: [PATCH 07/32] fix operand issue

---
 .../automation/SetupPanel/AutomationBlockSetup.svelte         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 2f9907794e..af54e4d2da 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -185,8 +185,8 @@
 
       if (
         idx === 0 &&
-        automation.trigger?.event === "row:update" &&
-        automation.trigger?.event === "row:save"
+        (automation.trigger?.event === "row:update" ||
+          automation.trigger?.event === "row:save")
       ) {
         if (name !== "id" && name !== "revision") return `trigger.row.${name}`
       }

From 8a90a1a3e49e8901c98edf06681471a88077f36e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 23 Jan 2024 10:10:38 +0000
Subject: [PATCH 08/32] pr comments

---
 .../builder/src/components/start/ChooseIconModal.svelte     | 1 -
 .../app/[application]/settings/automations/index.svelte     | 2 +-
 packages/server/src/events/AutomationEmitter.ts             | 6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/start/ChooseIconModal.svelte b/packages/builder/src/components/start/ChooseIconModal.svelte
index 1f26cb93ec..1ffaa35e34 100644
--- a/packages/builder/src/components/start/ChooseIconModal.svelte
+++ b/packages/builder/src/components/start/ChooseIconModal.svelte
@@ -49,7 +49,6 @@
       return
     }
     try {
-      console.log(app.instance._id)
       await apps.update(app.instance._id, {
         icon: { name, color },
       })
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
index 603f83a7dd..fde392e31d 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
@@ -37,7 +37,7 @@
   let timeRange = null
   let loaded = false
 
-  $: app = $apps.find(app => app.devId === $store.appId)
+  $: app = $apps.find(app => app.devId === $store.appId?.includes(app.appId))
   $: licensePlan = $auth.user?.license?.plan
   $: page = $pageInfo.page
   $: fetchLogs(automationId, status, page, timeRange)
diff --git a/packages/server/src/events/AutomationEmitter.ts b/packages/server/src/events/AutomationEmitter.ts
index 3297fc7263..32fd130929 100644
--- a/packages/server/src/events/AutomationEmitter.ts
+++ b/packages/server/src/events/AutomationEmitter.ts
@@ -4,6 +4,8 @@ import env from "../environment"
 import { Table, Row, DocumentType, App } from "@budibase/types"
 import { context } from "@budibase/backend-core"
 
+const MAX_AUTOMATIONS_ALLOWED = 5
+
 class AutomationEmitter {
   chainCount: number
   metadata: { automationChainCount: number }
@@ -21,9 +23,9 @@ class AutomationEmitter {
     let chainAutomations = appMetadata?.automations?.chainAutomations
 
     if (chainAutomations === true) {
-      return 5
+      return MAX_AUTOMATIONS_ALLOWED
     } else if (chainAutomations === undefined && env.SELF_HOSTED) {
-      return 5
+      return MAX_AUTOMATIONS_ALLOWED
     } else {
       return 0
     }

From 89502accb255564bdffa93866d078c4249f27729 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 23 Jan 2024 10:11:37 +0000
Subject: [PATCH 09/32] Bump version to 2.15.5

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 480b577bb4..587a678788 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.15.4",
+  "version": "2.15.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From a4797366adc4b36f4aa7073a4418b26be70a9aa2 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 23 Jan 2024 12:08:20 +0000
Subject: [PATCH 10/32] fix types

---
 packages/builder/src/builderStore/store/frontend.js | 1 -
 packages/types/src/documents/app/app.ts             | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index af48afb1bc..b05b127b1c 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -65,7 +65,6 @@ const INITIAL_FRONTEND_STATE = {
   features: {
     componentValidation: false,
     disableUserMetadata: false,
-    enableAutomationChaining: false,
   },
   errors: [],
   hasAppPackage: false,
diff --git a/packages/types/src/documents/app/app.ts b/packages/types/src/documents/app/app.ts
index e1174d4fe4..08aafc6527 100644
--- a/packages/types/src/documents/app/app.ts
+++ b/packages/types/src/documents/app/app.ts
@@ -23,7 +23,7 @@ export interface App extends Document {
   automationErrors?: AppMetadataErrors
   icon?: AppIcon
   features?: AppFeatures
-  automations: AutomationSettings
+  automations?: AutomationSettings
 }
 
 export interface AppInstance {
@@ -68,7 +68,6 @@ export interface AppIcon {
 export interface AppFeatures {
   componentValidation?: boolean
   disableUserMetadata?: boolean
-  enableAutomationChaining?: boolean
 }
 
 export interface AutomationSettings {

From 76780d1c8623a1dacc7765774cd474abccf71fbb Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 23 Jan 2024 16:12:53 +0100
Subject: [PATCH 11/32] Remove raw from manifest

---
 packages/string-templates/manifest.json       | 110 ++++++++----------
 packages/string-templates/package.json        |   2 +-
 .../scripts/gen-collection-info.js            |   5 +-
 yarn.lock                                     |   8 +-
 4 files changed, 60 insertions(+), 65 deletions(-)

diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json
index 36db081936..ee03d75aa3 100644
--- a/packages/string-templates/manifest.json
+++ b/packages/string-templates/manifest.json
@@ -137,7 +137,7 @@
         "n"
       ],
       "numArgs": 2,
-      "example": "{{ after [1, 2, 3] 1}} -> [3]",
+      "example": "{{ after ['a', 'b', 'c', 'd'] 2}} -> ['c', 'd']",
       "description": "<p>Returns all of the items in an array after the specified index. Opposite of <a href=\"#before\">before</a>.</p>\n"
     },
     "arrayify": {
@@ -154,7 +154,7 @@
         "n"
       ],
       "numArgs": 2,
-      "example": "{{ before [1, 2, 3] 2}} -> [1, 2]",
+      "example": "{{ before ['a', 'b', 'c', 'd'] 3}} -> ['a', 'b']",
       "description": "<p>Return all of the items in the collection before the specified count. Opposite of <a href=\"#after\">after</a>.</p>\n"
     },
     "eachIndex": {
@@ -182,7 +182,7 @@
         "n"
       ],
       "numArgs": 2,
-      "example": "{{first [1, 2, 3, 4] 2}} -> [1, 2]",
+      "example": "{{first [1, 2, 3, 4] 2}} -> 1,2",
       "description": "<p>Returns the first item, or first <code>n</code> items of an array.</p>\n"
     },
     "forEach": {
@@ -200,7 +200,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#inArray [1, 2, 3] 2}} 2 exists {{else}} 2 does not exist {{/inArray}} -> 2 exists",
+      "example": "{{#inArray [1, 2, 3] 2}} 2 exists {{else}} 2 does not exist {{/inArray}} -> ' 2 exists '",
       "description": "<p>Block helper that renders the block if an array has the given <code>value</code>. Optionally specify an inverse block to render when the array does not have the given value.</p>\n"
     },
     "isArray": {
@@ -226,7 +226,7 @@
         "separator"
       ],
       "numArgs": 2,
-      "example": "{{join [1, 2, 3]}} -> '1, 2, 3'",
+      "example": "{{join [1, 2, 3]}} -> 1, 2, 3",
       "description": "<p>Join all elements of array into a string, optionally using a given separator.</p>\n"
     },
     "equalsLength": {
@@ -236,7 +236,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{equalsLength '[1,2,3]' 3}} -> true",
+      "example": "{{equalsLength [1, 2, 3] 3}} -> true",
       "description": "<p>Returns true if the the length of the given <code>value</code> is equal to the given <code>length</code>. Can be used as a block or inline helper.</p>\n"
     },
     "last": {
@@ -253,7 +253,7 @@
         "value"
       ],
       "numArgs": 1,
-      "example": "{{length '[1, 2, 3]'}} -> 3",
+      "example": "{{length [1, 2, 3]}} -> 3",
       "description": "<p>Returns the length of the given string or array.</p>\n"
     },
     "lengthEqual": {
@@ -263,7 +263,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{equalsLength '[1,2,3]' 3}} -> true",
+      "example": "{{equalsLength [1, 2, 3] 3}} -> true",
       "description": "<p>Returns true if the the length of the given <code>value</code> is equal to the given <code>length</code>. Can be used as a block or inline helper.</p>\n"
     },
     "map": {
@@ -299,7 +299,7 @@
         "provided"
       ],
       "numArgs": 3,
-      "example": "{{#some [1, 'b', 3] isString}} string found {{else}} No string found {{/some}} -> string found",
+      "example": "{{#some [1, \"b\", 3] isString}} string found {{else}} No string found {{/some}} -> ' string found '",
       "description": "<p>Block helper that returns the block if the callback returns true for some value in the given array.</p>\n"
     },
     "sort": {
@@ -317,7 +317,7 @@
         "props"
       ],
       "numArgs": 2,
-      "example": "{{ sortBy [{a: 'zzz'}, {a: 'aaa'}] 'a' }} -> [{'a':'aaa'}, {'a':'zzz'}]",
+      "example": "{{ sortBy [{'a': 'zzz'}, {'a': 'aaa'}] 'a' }} -> [{'a':'aaa'},{'a':'zzz'}]",
       "description": "<p>Sort an <code>array</code>. If an array of objects is passed, you may optionally pass a <code>key</code> to sort on as the second argument. You may alternatively pass a sorting function as the second argument.</p>\n"
     },
     "withAfter": {
@@ -347,7 +347,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{ withFirst [1, 2, 3] }} {{this}} {{/withFirst}}",
+      "example": "{{#withFirst [1, 2, 3] }}{{this}}{{/withFirst}} -> 1",
       "description": "<p>Use the first item in a collection inside a handlebars block expression. Opposite of <a href=\"#withLast\">withLast</a>.</p>\n"
     },
     "withGroup": {
@@ -357,7 +357,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#withGroup [1, 2, 3, 4] 2}} {{#each this}} {{.}} {{each}} <br> {{/withGroup}} -> 1,2<br> 3,4<br>",
+      "example": "{{#withGroup [1, 2, 3, 4] 2}}{{#each this}}{{.}}{{/each}}<br>{{/withGroup}} -> 12<br>34<br>",
       "description": "<p>Block helper that groups array elements by given group <code>size</code>.</p>\n"
     },
     "withLast": {
@@ -367,7 +367,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#withLast [1, 2, 3, 4]}} {{this}} {{/withLast}} -> 4",
+      "example": "{{#withLast [1, 2, 3, 4]}}{{this}}{{/withLast}} -> 4",
       "description": "<p>Use the last item or <code>n</code> items in an array as context inside a block. Opposite of <a href=\"#withFirst\">withFirst</a>.</p>\n"
     },
     "withSort": {
@@ -377,7 +377,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#withSort ['b', 'a', 'c']}} {{this}} {{/withSort}} -> abc",
+      "example": "{{#withSort ['b', 'a', 'c']}}{{this}}{{/withSort}} -> abc",
       "description": "<p>Block helper that sorts a collection and exposes the sorted collection as context inside the block.</p>\n"
     },
     "unique": {
@@ -386,7 +386,7 @@
         "options"
       ],
       "numArgs": 2,
-      "example": "{{#each (unique ['a', 'a', 'c', 'b', 'e', 'e']) }} {{.}} {{/each}} -> acbe",
+      "example": "{{#each (unique ['a', 'a', 'c', 'b', 'e', 'e']) }}{{.}}{{/each}} -> acbe",
       "description": "<p>Block helper that return an array with all duplicate values removed. Best used along with a <a href=\"#each\">each</a> helper.</p>\n"
     }
   },
@@ -396,7 +396,7 @@
         "number"
       ],
       "numArgs": 1,
-      "example": "{{ bytes 1386 }} -> 1.4Kb",
+      "example": "{{ bytes 1386 1 }} -> 1.4 kB",
       "description": "<p>Format a number to it&#39;s equivalent in bytes. If a string is passed, it&#39;s length will be formatted and returned. <strong>Examples:</strong> - <code>&#39;foo&#39; =&gt; 3 B</code> - <code>13661855 =&gt; 13.66 MB</code> - <code>825399 =&gt; 825.39 kB</code> - <code>1396 =&gt; 1.4 kB</code></p>\n"
     },
     "addCommas": {
@@ -430,7 +430,7 @@
         "fractionDigits"
       ],
       "numArgs": 2,
-      "example": "{{ toExponential 10123 2 }} -> 101e+4",
+      "example": "{{ toExponential 10123 2 }} -> 1.01e+4",
       "description": "<p>Returns a string representing the given number in exponential notation.</p>\n"
     },
     "toFixed": {
@@ -472,7 +472,7 @@
         "str"
       ],
       "numArgs": 1,
-      "example": "{{ encodeURI 'https://myurl?Hello There' }} -> https://myurl?Hello%20There",
+      "example": "{{ encodeURI 'https://myurl?Hello There' }} -> https%3A%2F%2Fmyurl%3FHello%20There",
       "description": "<p>Encodes a Uniform Resource Identifier (URI) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.</p>\n"
     },
     "escape": {
@@ -480,7 +480,7 @@
         "str"
       ],
       "numArgs": 1,
-      "example": "{{ escape 'https://myurl?Hello+There' }} -> https://myurl?Hello%20There",
+      "example": "{{ escape 'https://myurl?Hello+There' }} -> https%3A%2F%2Fmyurl%3FHello%2BThere",
       "description": "<p>Escape the given string by replacing characters with escape sequences. Useful for allowing the string to be used in a URL, etc.</p>\n"
     },
     "decodeURI": {
@@ -488,7 +488,7 @@
         "str"
       ],
       "numArgs": 1,
-      "example": "{{ decodeURI 'https://myurl?Hello%20There' }} -> https://myurl?=Hello There",
+      "example": "{{ decodeURI 'https://myurl?Hello%20There' }} -> https://myurl?Hello There",
       "description": "<p>Decode a Uniform Resource Identifier (URI) component.</p>\n"
     },
     "urlResolve": {
@@ -513,7 +513,7 @@
         "url"
       ],
       "numArgs": 1,
-      "example": "{{ stripQueryString 'https://myurl/api/test?foo=bar' }} -> 'https://myurl/api/test'",
+      "example": "{{ stripQuerystring 'https://myurl/api/test?foo=bar' }} -> 'https://myurl/api/test'",
       "description": "<p>Strip the query string from the given <code>url</code>.</p>\n"
     },
     "stripProtocol": {
@@ -521,7 +521,7 @@
         "str"
       ],
       "numArgs": 1,
-      "example": "{{ stripProtocol 'https://myurl/api/test' }} -> 'myurl/api/test'",
+      "example": "{{ stripProtocol 'https://myurl/api/test' }} -> '//myurl/api/test'",
       "description": "<p>Strip protocol from a <code>url</code>. Useful for displaying media that may have an &#39;http&#39; protocol on secure connections.</p>\n"
     }
   },
@@ -573,7 +573,7 @@
         "string"
       ],
       "numArgs": 1,
-      "example": "{{ chop ' ABC '}} -> 'ABC'",
+      "example": "{{ chop ' ABC '}} -> ABC",
       "description": "<p>Like trim, but removes both extraneous whitespace <strong>and non-word characters</strong> from the beginning and end of a string.</p>\n"
     },
     "dashcase": {
@@ -606,7 +606,7 @@
         "length"
       ],
       "numArgs": 2,
-      "example": "{{ellipsis 'foo bar baz', 7}} -> foo bar…",
+      "example": "{{ellipsis 'foo bar baz' 7}} -> foo bar…",
       "description": "<p>Truncates a string to the specified <code>length</code>, and appends it with an elipsis, <code>…</code>.</p>\n"
     },
     "hyphenate": {
@@ -675,14 +675,6 @@
       "example": "{{prepend 'bar' 'foo-'}} -> foo-bar",
       "description": "<p>Prepends the given <code>string</code> with the specified <code>prefix</code>.</p>\n"
     },
-    "raw": {
-      "args": [
-        "options"
-      ],
-      "numArgs": 1,
-      "example": "{{{{#raw}}}} {{foo}} {{{{/raw}}}} -> {{foo}}",
-      "description": "<p>Render a block without processing mustache templates inside the block.</p>\n"
-    },
     "remove": {
       "args": [
         "str",
@@ -698,7 +690,7 @@
         "substring"
       ],
       "numArgs": 2,
-      "example": "{{remove 'a b a b a b' 'a'}} ->  b a b a b",
+      "example": "{{removeFirst 'a b a b a b' 'a'}} -> ' b a b a b'",
       "description": "<p>Remove the first occurrence of <code>substring</code> from the given <code>str</code>.</p>\n"
     },
     "replace": {
@@ -718,7 +710,7 @@
         "b"
       ],
       "numArgs": 3,
-      "example": "{{replace 'a b a b a b' 'a' 'z'}} -> z b a b a b",
+      "example": "{{replaceFirst 'a b a b a b' 'a' 'z'}} -> z b a b a b",
       "description": "<p>Replace the first occurrence of substring <code>a</code> with substring <code>b</code>.</p>\n"
     },
     "sentence": {
@@ -752,7 +744,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#startsWith 'Goodbye' 'Hello, world!'}} Yep {{else}} Nope {{/startsWith}} -> Nope",
+      "example": "{{#startsWith 'Goodbye' 'Hello, world!'}}Yep{{else}}Nope{{/startsWith}} -> Nope",
       "description": "<p>Tests whether a string begins with the given prefix.</p>\n"
     },
     "titleize": {
@@ -760,7 +752,7 @@
         "str"
       ],
       "numArgs": 1,
-      "example": "{{#titleize 'this is title case' }} -> This Is Title Case",
+      "example": "{{titleize 'this is title case' }} -> This Is Title Case",
       "description": "<p>Title case the given string.</p>\n"
     },
     "trim": {
@@ -784,7 +776,7 @@
         "string"
       ],
       "numArgs": 1,
-      "example": "{{trimRight '  ABC ' }} ->  '  ABC '",
+      "example": "{{trimRight '  ABC ' }} ->  '  ABC'",
       "description": "<p>Removes extraneous whitespace from the end of a string.</p>\n"
     },
     "truncate": {
@@ -804,7 +796,7 @@
         "suffix"
       ],
       "numArgs": 3,
-      "example": "{{truncateWords 'foo bar baz' 1 }} -> foo",
+      "example": "{{truncateWords 'foo bar baz' 1 }} -> foo…",
       "description": "<p>Truncate a string to have the specified number of words. Also see <a href=\"#truncate\">truncate</a>.</p>\n"
     },
     "upcase": {
@@ -844,7 +836,7 @@
         "options"
       ],
       "numArgs": 4,
-      "example": "{{compare 10 '<' 5 }} -> true",
+      "example": "{{compare 10 '<' 5 }} -> false",
       "description": "<p>Render a block when a comparison of the first and third arguments returns true. The second argument is the [arithemetic operator][operators] to use. You may also optionally specify an inverse block to render when falsy.</p>\n"
     },
     "contains": {
@@ -874,7 +866,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#eq 3 3}} equal{{else}} not equal{{/eq}} -> equal",
+      "example": "{{#eq 3 3}}equal{{else}}not equal{{/eq}} -> equal",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
     },
     "gt": {
@@ -884,7 +876,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#gt 4 3}} greater than{{else}} not greater than{{/gt}} -> greater than",
+      "example": "{{#gt 4 3}} greater than{{else}} not greater than{{/gt}} -> ' greater than'",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>greater than</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
     },
     "gte": {
@@ -894,7 +886,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#gte 4 3}} greater than or equal{{else}} not greater than{{/gte}} -> greater than or equal",
+      "example": "{{#gte 4 3}} greater than or equal{{else}} not greater than{{/gte}} -> ' greater than or equal'",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>greater than or equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
     },
     "has": {
@@ -904,7 +896,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#has 'foobar' 'foo'}} has it{{else}} doesn't{{/has}} -> has it",
+      "example": "{{#has 'foobar' 'foo'}}has it{{else}}doesn't{{/has}} -> has it",
       "description": "<p>Block helper that renders a block if <code>value</code> has <code>pattern</code>. If an inverse block is specified it will be rendered when falsy.</p>\n"
     },
     "isFalsey": {
@@ -931,7 +923,7 @@
         "options"
       ],
       "numArgs": 2,
-      "example": "{{#ifEven 2}} even {{else}} odd {{/ifEven}} -> even",
+      "example": "{{#ifEven 2}} even {{else}} odd {{/ifEven}} -> ' even '",
       "description": "<p>Return true if the given value is an even number.</p>\n"
     },
     "ifNth": {
@@ -941,8 +933,8 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#ifNth 10 2}} remainder {{else}} no remainder {{/ifNth}} -> remainder",
-      "description": "<p>Conditionally renders a block if the remainder is zero when <code>a</code> operand is divided by <code>b</code>. If an inverse block is specified it will be rendered when the remainder is <strong>not zero</strong>.</p>\n"
+      "example": "{{#ifNth 2 10}}remainder{{else}}no remainder{{/ifNth}} -> remainder",
+      "description": "<p>Conditionally renders a block if the remainder is zero when <code>b</code> operand is divided by <code>a</code>. If an inverse block is specified it will be rendered when the remainder is <strong>not zero</strong>.</p>\n"
     },
     "ifOdd": {
       "args": [
@@ -950,7 +942,7 @@
         "options"
       ],
       "numArgs": 2,
-      "example": "{{#ifOdd 3}} odd {{else}} even {{/ifOdd}} -> odd",
+      "example": "{{#ifOdd 3}}odd{{else}}even{{/ifOdd}} -> odd",
       "description": "<p>Block helper that renders a block if <code>value</code> is <strong>an odd number</strong>. If an inverse block is specified it will be rendered when falsy.</p>\n"
     },
     "is": {
@@ -960,7 +952,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#is 3 3}} is {{else}} is not {{/is}} -> is",
+      "example": "{{#is 3 3}} is {{else}} is not {{/is}} -> ' is '",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. Similar to <a href=\"#eq\">eq</a> but does not do strict equality.</p>\n"
     },
     "isnt": {
@@ -970,7 +962,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#isnt 3 3}} isnt {{else}} is {{/isnt}} -> is",
+      "example": "{{#isnt 3 3}} isnt {{else}} is {{/isnt}} -> ' is '",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>not equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. Similar to <a href=\"#unlesseq\">unlessEq</a> but does not use strict equality for comparisons.</p>\n"
     },
     "lt": {
@@ -979,7 +971,7 @@
         "options"
       ],
       "numArgs": 2,
-      "example": "{{#lt 2 3}} less than {{else}} more than or equal {{/lt}} -> less than",
+      "example": "{{#lt 2 3}} less than {{else}} more than or equal {{/lt}} -> ' less than '",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>less than</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
     },
     "lte": {
@@ -989,7 +981,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#lte 2 3}} less than or equal {{else}} more than {{/lte}} -> less than or equal",
+      "example": "{{#lte 2 3}} less than or equal {{else}} more than {{/lte}} -> ' less than or equal '",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>less than or equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
     },
     "neither": {
@@ -999,7 +991,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#neither null null}} both falsey {{else}} both not falsey {{/neither}} -> both falsey",
+      "example": "{{#neither null null}}both falsey{{else}}both not falsey{{/neither}} -> both falsey",
       "description": "<p>Block helper that renders a block if <strong>neither of</strong> the given values are truthy. If an inverse block is specified it will be rendered when falsy.</p>\n"
     },
     "not": {
@@ -1008,7 +1000,7 @@
         "options"
       ],
       "numArgs": 2,
-      "example": "{{#not undefined }} falsey {{else}} not falsey {{/not}} -> falsey",
+      "example": "{{#not undefined }}falsey{{else}}not falsey{{/not}} -> falsey",
       "description": "<p>Returns true if <code>val</code> is falsey. Works as a block or inline helper.</p>\n"
     },
     "or": {
@@ -1017,7 +1009,7 @@
         "options"
       ],
       "numArgs": 2,
-      "example": "{{#or 1 2 undefined }} at least one truthy {{else}} all falsey {{/or}} -> at least one truthy",
+      "example": "{{#or 1 2 undefined }} at least one truthy {{else}} all falsey {{/or}} -> ' at least one truthy '",
       "description": "<p>Block helper that renders a block if <strong>any of</strong> the given values is truthy. If an inverse block is specified it will be rendered when falsy.</p>\n"
     },
     "unlessEq": {
@@ -1027,7 +1019,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#unlessEq 2 1 }} not equal {{else}} equal {{/unlessEq}} -> not equal",
+      "example": "{{#unlessEq 2 1 }} not equal {{else}} equal {{/unlessEq}} -> ' not equal '",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is equal to <code>b</code></strong>.</p>\n"
     },
     "unlessGt": {
@@ -1037,7 +1029,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#unlessGt 20 1 }} not greater than {{else}} greater than {{/unlessGt}} -> greater than",
+      "example": "{{#unlessGt 20 1 }} not greater than {{else}} greater than {{/unlessGt}} -> ' greater than '",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is greater than <code>b</code></strong>.</p>\n"
     },
     "unlessLt": {
@@ -1047,7 +1039,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#unlessLt 20 1 }} greater than or equal {{else}} less than {{/unlessLt}} -> greater than or equal",
+      "example": "{{#unlessLt 20 1 }}greater than or equal{{else}}less than{{/unlessLt}} -> greater than or equal",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is less than <code>b</code></strong>.</p>\n"
     },
     "unlessGteq": {
@@ -1057,7 +1049,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#unlessGteq 20 1 }} less than {{else}} greater than or equal to {{/unlessGteq}} -> greater than or equal to",
+      "example": "{{#unlessGteq 20 1 }} less than {{else}}greater than or equal to{{/unlessGteq}} -> greater than or equal to",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is greater than or equal to <code>b</code></strong>.</p>\n"
     },
     "unlessLteq": {
@@ -1067,7 +1059,7 @@
         "options"
       ],
       "numArgs": 3,
-      "example": "{{#unlessLteq 20 1 }} greater than {{else}} less than or equal to {{/unlessLteq}} -> greater than",
+      "example": "{{#unlessLteq 20 1 }} greater than {{else}} less than or equal to {{/unlessLteq}} -> ' greater than '",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is less than or equal to <code>b</code></strong>.</p>\n"
     }
   },
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 1a52adf38c..dfbff1a24b 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -25,7 +25,7 @@
     "manifest": "node ./scripts/gen-collection-info.js"
   },
   "dependencies": {
-    "@budibase/handlebars-helpers": "^0.12.0",
+    "@budibase/handlebars-helpers": "^0.13.0",
     "dayjs": "^1.10.8",
     "handlebars": "^4.7.6",
     "lodash.clonedeep": "^4.5.0",
diff --git a/packages/string-templates/scripts/gen-collection-info.js b/packages/string-templates/scripts/gen-collection-info.js
index e42c9ccaf0..815f3b607f 100644
--- a/packages/string-templates/scripts/gen-collection-info.js
+++ b/packages/string-templates/scripts/gen-collection-info.js
@@ -118,6 +118,8 @@ function getCommentInfo(file, func) {
   return docs
 }
 
+const excludeFunctions = { string: ["raw"] }
+
 /**
  * This script is very specific to purpose, parsing the handlebars-helpers files to attempt to get information about them.
  */
@@ -136,7 +138,8 @@ function run() {
       // skip built in functions and ones seen already
       if (
         HelperFunctionBuiltin.indexOf(name) !== -1 ||
-        foundNames.indexOf(name) !== -1
+        foundNames.indexOf(name) !== -1 ||
+        excludeFunctions[collection]?.includes(name)
       ) {
         continue
       }
diff --git a/yarn.lock b/yarn.lock
index 7750c8df7b..37e0e591e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2031,10 +2031,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/handlebars-helpers@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.12.0.tgz#dcc4ba8d796a611474e3495b1142c56b470ca67d"
-  integrity sha512-JjGboau7KMdrVSO8gGJzgo1ACSeD4BxN46vidIx9hvdrEXy+v1x2bfQZMaq/c7Dv+V1vyq7c006XwxR1bpfARg==
+"@budibase/handlebars-helpers@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.13.0.tgz#224333d14e3900b7dacf48286af1e624a9fd62ea"
+  integrity sha512-g8+sFrMNxsIDnK+MmdUICTVGr6ReUFtnPp9hJX0VZwz1pN3Ynolpk/Qbu6rEWAvoU1sEqY1mXr9uo/+kEfeGbQ==
   dependencies:
     get-object "^0.2.0"
     get-value "^3.0.1"

From afd5b593f8b3a92f4e1f7551ba2702ab690bbb03 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 23 Jan 2024 19:31:22 +0100
Subject: [PATCH 12/32] Fix test

---
 packages/string-templates/test/helpers.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/string-templates/test/helpers.spec.js b/packages/string-templates/test/helpers.spec.js
index 380b0f2833..75de373109 100644
--- a/packages/string-templates/test/helpers.spec.js
+++ b/packages/string-templates/test/helpers.spec.js
@@ -61,10 +61,10 @@ describe("test the array helpers", () => {
   })
 
   it("should allow use of the before helper", async () => {
-    const output = await processString("{{before array 2}}", {
+    const output = await processString("{{before array 3}}", {
       array,
     })
-    expect(output).toBe("hi,person,how")
+    expect(output).toBe("hi,person")
   })
 
   it("should allow use of the filter helper", async () => {

From daa87915e889300be75e07e89fdca1d6405bcc90 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 19 Jan 2024 13:45:23 +0100
Subject: [PATCH 13/32] Test examples

---
 .../string-templates/test/manifest.spec.js    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 packages/string-templates/test/manifest.spec.js

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
new file mode 100644
index 0000000000..90e23dcedd
--- /dev/null
+++ b/packages/string-templates/test/manifest.spec.js
@@ -0,0 +1,22 @@
+const fs = require("fs")
+const { processString } = require("../src/index.cjs")
+
+const manifest = JSON.parse(
+  fs.readFileSync(require.resolve("../manifest.json"), "utf8")
+)
+
+const examples = Object.keys(manifest).flatMap(collection =>
+  Object.keys(manifest[collection]).map(fnc => [collection, fnc])
+)
+
+describe("manifest", () => {
+  describe("examples are valid", () => {
+    it.each(examples)("%s - %s", async (collection, func) => {
+      const example = manifest[collection][func].example
+
+      const [hbs, js] = example.split("->").map(x => x.trim())
+
+      expect(await processString(hbs)).toEqual(js)
+    })
+  })
+})

From f783602d9fbde9479f1cde36506d0f85c78c7ca8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 19 Jan 2024 14:05:35 +0100
Subject: [PATCH 14/32] Fix date test examples

---
 packages/string-templates/manifest.json         | 2 +-
 packages/string-templates/test/manifest.spec.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json
index ee03d75aa3..9dd8260350 100644
--- a/packages/string-templates/manifest.json
+++ b/packages/string-templates/manifest.json
@@ -1196,7 +1196,7 @@
         "durationType"
       ],
       "numArgs": 2,
-      "example": "{{duration timeLeft \"seconds\"}} -> a few seconds",
+      "example": "{{duration 8 \"seconds\"}} -> a few seconds",
       "description": "<p>Produce a humanized duration left/until given an amount of time and the type of time measurement.</p>\n"
     }
   }
diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 90e23dcedd..36c1b1bd0b 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -1,6 +1,9 @@
 const fs = require("fs")
 const { processString } = require("../src/index.cjs")
 
+const tk = require("timekeeper")
+tk.freeze("2021-01-21T12:00:00")
+
 const manifest = JSON.parse(
   fs.readFileSync(require.resolve("../manifest.json"), "utf8")
 )

From ac9f8bd4989697b96e4063abe3d2407ad81159fc Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 10:40:26 +0100
Subject: [PATCH 15/32] Fix random test

---
 packages/string-templates/test/manifest.spec.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 36c1b1bd0b..62fd5acf99 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -1,3 +1,12 @@
+jest.mock("@budibase/handlebars-helpers/lib/math", () => {
+  const actual = jest.requireActual("@budibase/handlebars-helpers/lib/math")
+
+  return {
+    ...actual,
+    random: () => 10,
+  }
+})
+
 const fs = require("fs")
 const { processString } = require("../src/index.cjs")
 

From 537eae7b98cf900920a7cf89a25598c91e28b30f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 10:44:49 +0100
Subject: [PATCH 16/32] Fix sum

---
 packages/string-templates/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json
index 9dd8260350..951f5fecdc 100644
--- a/packages/string-templates/manifest.json
+++ b/packages/string-templates/manifest.json
@@ -126,7 +126,7 @@
         "array"
       ],
       "numArgs": 1,
-      "example": "{{ sum [1, 2, 3] }} -> 6",
+      "example": "{{ sum 1 2 3 }} -> 6",
       "description": "<p>Returns the sum of all numbers in the given array.</p>\n"
     }
   },

From dc0bef20d86d92018cebb5e549571fc17e87d24a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 12:16:52 +0100
Subject: [PATCH 17/32] Fix sum

---
 packages/string-templates/manifest.json         | 2 +-
 packages/string-templates/test/manifest.spec.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json
index 951f5fecdc..008c537abc 100644
--- a/packages/string-templates/manifest.json
+++ b/packages/string-templates/manifest.json
@@ -126,7 +126,7 @@
         "array"
       ],
       "numArgs": 1,
-      "example": "{{ sum 1 2 3 }} -> 6",
+      "example": "{{ sum '[1, 2, 3]' }} -> 6",
       "description": "<p>Returns the sum of all numbers in the given array.</p>\n"
     }
   },
diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 62fd5acf99..2457467de3 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -26,9 +26,10 @@ describe("manifest", () => {
     it.each(examples)("%s - %s", async (collection, func) => {
       const example = manifest[collection][func].example
 
-      const [hbs, js] = example.split("->").map(x => x.trim())
+      let [hbs, js] = example.split("->").map(x => x.trim())
+      hbs = hbs.replace(/'\[1, 2, 3\]'/, "array")
 
-      expect(await processString(hbs)).toEqual(js)
+      expect(await processString(hbs, { array: [1, 2, 3] })).toEqual(js)
     })
   })
 })

From 6abaf589ff9669a6521fd50e17641172856d0756 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 12:16:59 +0100
Subject: [PATCH 18/32] Fix duration generation

---
 packages/string-templates/scripts/gen-collection-info.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/string-templates/scripts/gen-collection-info.js b/packages/string-templates/scripts/gen-collection-info.js
index 815f3b607f..b487c4dde4 100644
--- a/packages/string-templates/scripts/gen-collection-info.js
+++ b/packages/string-templates/scripts/gen-collection-info.js
@@ -36,7 +36,7 @@ const ADDED_HELPERS = {
     duration: {
       args: ["time", "durationType"],
       numArgs: 2,
-      example: '{{duration timeLeft "seconds"}} -> a few seconds',
+      example: '{{duration 8 "seconds"}} -> a few seconds',
       description:
         "Produce a humanized duration left/until given an amount of time and the type of time measurement.",
     },

From 142b404a91600dc63832bf075f16f90f78be0010 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 12:18:47 +0100
Subject: [PATCH 19/32] Array instead of string

---
 packages/string-templates/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json
index 008c537abc..9dd8260350 100644
--- a/packages/string-templates/manifest.json
+++ b/packages/string-templates/manifest.json
@@ -126,7 +126,7 @@
         "array"
       ],
       "numArgs": 1,
-      "example": "{{ sum '[1, 2, 3]' }} -> 6",
+      "example": "{{ sum [1, 2, 3] }} -> 6",
       "description": "<p>Returns the sum of all numbers in the given array.</p>\n"
     }
   },

From 7705397da3b839fd7b3564abbbd59885baa31e80 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 12:18:53 +0100
Subject: [PATCH 20/32] Array instead of string

---
 packages/string-templates/test/manifest.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 2457467de3..1e1f58dae0 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -27,7 +27,7 @@ describe("manifest", () => {
       const example = manifest[collection][func].example
 
       let [hbs, js] = example.split("->").map(x => x.trim())
-      hbs = hbs.replace(/'\[1, 2, 3\]'/, "array")
+      hbs = hbs.replace(/\[1, 2, 3\]/, "array")
 
       expect(await processString(hbs, { array: [1, 2, 3] })).toEqual(js)
     })

From c59750cc9ea38ee9708505b4c9bb3f313519f4ca Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 12:24:03 +0100
Subject: [PATCH 21/32] Fix some array tests

---
 packages/string-templates/test/manifest.spec.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 1e1f58dae0..38033a377e 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -27,9 +27,20 @@ describe("manifest", () => {
       const example = manifest[collection][func].example
 
       let [hbs, js] = example.split("->").map(x => x.trim())
-      hbs = hbs.replace(/\[1, 2, 3\]/, "array")
+      hbs = hbs.replace(/\[1, 2, 3\]/, "array3")
+      hbs = hbs.replace(/\[1, 2, 3, 4\]/, "array4")
 
-      expect(await processString(hbs, { array: [1, 2, 3] })).toEqual(js)
+      if (js === undefined) {
+        // The function has no return value
+        return
+      }
+
+      expect(
+        await processString(hbs, {
+          array3: [1, 2, 3],
+          array4: [1, 2, 3, 4],
+        })
+      ).toEqual(js)
     })
   })
 })

From 6f87a6f0bc8c4e6bb3557e9bad728864db41c6a5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 14:57:35 +0100
Subject: [PATCH 22/32] Fix some array examples

---
 .../string-templates/test/manifest.spec.js    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 38033a377e..d7e3cfa18f 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -21,26 +21,32 @@ const examples = Object.keys(manifest).flatMap(collection =>
   Object.keys(manifest[collection]).map(fnc => [collection, fnc])
 )
 
+function escapeRegExp(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // $& means the whole matched string
+}
+
 describe("manifest", () => {
   describe("examples are valid", () => {
     it.each(examples)("%s - %s", async (collection, func) => {
       const example = manifest[collection][func].example
 
       let [hbs, js] = example.split("->").map(x => x.trim())
-      hbs = hbs.replace(/\[1, 2, 3\]/, "array3")
-      hbs = hbs.replace(/\[1, 2, 3, 4\]/, "array4")
+
+      const context = {}
+
+      const arrays = hbs.match(/\[[^/\]]+\]/)
+      arrays.forEach((arrayString, i) => {
+        hbs = hbs.replace(new RegExp(escapeRegExp(arrayString)), `array${i}`)
+        context[`array${i}`] = JSON.parse(arrayString)
+      })
 
       if (js === undefined) {
         // The function has no return value
         return
       }
 
-      expect(
-        await processString(hbs, {
-          array3: [1, 2, 3],
-          array4: [1, 2, 3, 4],
-        })
-      ).toEqual(js)
+      const result = await processString(hbs, context)
+      expect(result).toEqual(js)
     })
   })
 })

From b66fac87cc89cbc163fb3561a82c36395c3c6f0c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 15:30:15 +0100
Subject: [PATCH 23/32] Fix some array examples

---
 packages/string-templates/test/manifest.spec.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index d7e3cfa18f..b10bd3cd31 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -32,12 +32,14 @@ describe("manifest", () => {
 
       let [hbs, js] = example.split("->").map(x => x.trim())
 
-      const context = {}
+      const context = {
+        double: i => i * 2,
+      }
 
       const arrays = hbs.match(/\[[^/\]]+\]/)
       arrays.forEach((arrayString, i) => {
         hbs = hbs.replace(new RegExp(escapeRegExp(arrayString)), `array${i}`)
-        context[`array${i}`] = JSON.parse(arrayString)
+        context[`array${i}`] = JSON.parse(arrayString.replace(/\'/g, '"'))
       })
 
       if (js === undefined) {
@@ -46,6 +48,14 @@ describe("manifest", () => {
       }
 
       const result = await processString(hbs, context)
+      try {
+        let parsedExpected
+        if (
+          Array.isArray((parsedExpected = JSON.parse(js.replace(/\'/g, '"'))))
+        ) {
+          js = parsedExpected.join(",")
+        }
+      } catch {}
       expect(result).toEqual(js)
     })
   })

From 603943d7cf9a34a195b2f0679e7dea7ce8caf732 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 22:06:40 +0100
Subject: [PATCH 24/32] Refactor tests

---
 .../string-templates/test/manifest.spec.js    | 74 +++++++++++--------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index b10bd3cd31..c03306cd19 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -17,8 +17,15 @@ const manifest = JSON.parse(
   fs.readFileSync(require.resolve("../manifest.json"), "utf8")
 )
 
-const examples = Object.keys(manifest).flatMap(collection =>
-  Object.keys(manifest[collection]).map(fnc => [collection, fnc])
+const functionsToExclude = { string: ["raw"] }
+
+const collections = Object.keys(manifest)
+const examples = collections.reduce(
+  (acc, collection) => ({
+    ...acc,
+    [collection]: manifest[collection],
+  }),
+  {}
 )
 
 function escapeRegExp(string) {
@@ -27,36 +34,45 @@ function escapeRegExp(string) {
 
 describe("manifest", () => {
   describe("examples are valid", () => {
-    it.each(examples)("%s - %s", async (collection, func) => {
-      const example = manifest[collection][func].example
+    describe.each(collections)("%s", collection => {
+      it.each(
+        Object.keys(examples[collection]).filter(
+          fnc => !functionsToExclude[collection]?.includes(fnc)
+        )
+      )("%s", async func => {
+        const example = manifest[collection][func].example
 
-      let [hbs, js] = example.split("->").map(x => x.trim())
+        let [hbs, js] = example.split("->").map(x => x.trim())
 
-      const context = {
-        double: i => i * 2,
-      }
-
-      const arrays = hbs.match(/\[[^/\]]+\]/)
-      arrays.forEach((arrayString, i) => {
-        hbs = hbs.replace(new RegExp(escapeRegExp(arrayString)), `array${i}`)
-        context[`array${i}`] = JSON.parse(arrayString.replace(/\'/g, '"'))
-      })
-
-      if (js === undefined) {
-        // The function has no return value
-        return
-      }
-
-      const result = await processString(hbs, context)
-      try {
-        let parsedExpected
-        if (
-          Array.isArray((parsedExpected = JSON.parse(js.replace(/\'/g, '"'))))
-        ) {
-          js = parsedExpected.join(",")
+        const context = {
+          double: i => i * 2,
         }
-      } catch {}
-      expect(result).toEqual(js)
+
+        const arrays = hbs.match(/\[[^/\]]+\]/)
+        arrays?.forEach((arrayString, i) => {
+          hbs = hbs.replace(new RegExp(escapeRegExp(arrayString)), `array${i}`)
+          context[`array${i}`] = JSON.parse(arrayString.replace(/\'/g, '"'))
+        })
+
+        if (js === undefined) {
+          // The function has no return value
+          return
+        }
+
+        let result = await processString(hbs, context)
+        // Trim 's
+        js = js.replace(/^\'|\'$/g, "")
+        try {
+          let parsedExpected
+          if (
+            Array.isArray((parsedExpected = JSON.parse(js.replace(/\'/g, '"'))))
+          ) {
+            js = parsedExpected.join(",")
+          }
+        } catch {}
+        result = result.replace(/&nbsp;/g, " ")
+        expect(result).toEqual(js)
+      })
     })
   })
 })

From 4829cdc4ce64e3b1385168fac90e0dfeb6da5a07 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 22:08:55 +0100
Subject: [PATCH 25/32] Fix uuid tests

---
 packages/string-templates/test/manifest.spec.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index c03306cd19..8c53ea0302 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -6,6 +6,14 @@ jest.mock("@budibase/handlebars-helpers/lib/math", () => {
     random: () => 10,
   }
 })
+jest.mock("@budibase/handlebars-helpers/lib/uuid", () => {
+  const actual = jest.requireActual("@budibase/handlebars-helpers/lib/uuid")
+
+  return {
+    ...actual,
+    uuid: () => "f34ebc66-93bd-4f7c-b79b-92b5569138bc",
+  }
+})
 
 const fs = require("fs")
 const { processString } = require("../src/index.cjs")

From 99e5bc1a57d4106b21f1fa1267a0aef6c3d5c2cf Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 22 Jan 2024 22:35:35 +0100
Subject: [PATCH 26/32] Refactor

---
 .../string-templates/test/manifest.spec.js    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 8c53ea0302..5153f1dbed 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -28,13 +28,17 @@ const manifest = JSON.parse(
 const functionsToExclude = { string: ["raw"] }
 
 const collections = Object.keys(manifest)
-const examples = collections.reduce(
-  (acc, collection) => ({
-    ...acc,
-    [collection]: manifest[collection],
-  }),
-  {}
-)
+const examples = collections.reduce((acc, collection) => {
+  const functions = Object.keys(manifest[collection]).filter(
+    fnc =>
+      !functionsToExclude[collection]?.includes(fnc) &&
+      manifest[collection][fnc].example
+  )
+  if (functions.length) {
+    acc[collection] = functions
+  }
+  return acc
+}, {})
 
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // $& means the whole matched string
@@ -42,12 +46,8 @@ function escapeRegExp(string) {
 
 describe("manifest", () => {
   describe("examples are valid", () => {
-    describe.each(collections)("%s", collection => {
-      it.each(
-        Object.keys(examples[collection]).filter(
-          fnc => !functionsToExclude[collection]?.includes(fnc)
-        )
-      )("%s", async func => {
+    describe.each(Object.keys(examples))("%s", collection => {
+      it.each(examples[collection])("%s", async func => {
         const example = manifest[collection][func].example
 
         let [hbs, js] = example.split("->").map(x => x.trim())

From ea0e36b7a42461f6294e2e370d3ca39653d9ccaa Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 23 Jan 2024 14:28:52 +0100
Subject: [PATCH 27/32] Don't explicitly exclude raw

---
 packages/string-templates/test/manifest.spec.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 5153f1dbed..091d2789af 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -25,14 +25,10 @@ const manifest = JSON.parse(
   fs.readFileSync(require.resolve("../manifest.json"), "utf8")
 )
 
-const functionsToExclude = { string: ["raw"] }
-
 const collections = Object.keys(manifest)
 const examples = collections.reduce((acc, collection) => {
   const functions = Object.keys(manifest[collection]).filter(
-    fnc =>
-      !functionsToExclude[collection]?.includes(fnc) &&
-      manifest[collection][fnc].example
+    fnc => manifest[collection][fnc].example
   )
   if (functions.length) {
     acc[collection] = functions

From f193c276f6e63c51fc8fb2984a8cd86443988224 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 23 Jan 2024 14:28:58 +0100
Subject: [PATCH 28/32] Fix test

---
 packages/string-templates/test/manifest.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 091d2789af..f1b4277b79 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -50,6 +50,7 @@ describe("manifest", () => {
 
         const context = {
           double: i => i * 2,
+          isString: x => typeof x === "string",
         }
 
         const arrays = hbs.match(/\[[^/\]]+\]/)

From 108508db7ecd39acd0baa3204147ba15b2b4b4f6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 23 Jan 2024 16:00:07 +0100
Subject: [PATCH 29/32] Fix tests

---
 packages/string-templates/test/manifest.spec.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index f1b4277b79..ccfb14b4e0 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -72,7 +72,11 @@ describe("manifest", () => {
           if (
             Array.isArray((parsedExpected = JSON.parse(js.replace(/\'/g, '"'))))
           ) {
-            js = parsedExpected.join(",")
+            if (typeof parsedExpected[0] === "object") {
+              js = JSON.stringify(parsedExpected)
+            } else {
+              js = parsedExpected.join(",")
+            }
           }
         } catch {}
         result = result.replace(/&nbsp;/g, " ")

From 52fca8714d88123121d794700efa586282a42dac Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 23 Jan 2024 19:40:31 +0100
Subject: [PATCH 30/32] More verbose test code

---
 .../string-templates/test/manifest.spec.js    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index ccfb14b4e0..506f2eb6f7 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -40,6 +40,18 @@ function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // $& means the whole matched string
 }
 
+function tryParseJson(str) {
+  if (typeof str !== "string") {
+    return
+  }
+
+  try {
+    return JSON.parse(str.replace(/\'/g, '"'))
+  } catch (e) {
+    return
+  }
+}
+
 describe("manifest", () => {
   describe("examples are valid", () => {
     describe.each(Object.keys(examples))("%s", collection => {
@@ -67,18 +79,15 @@ describe("manifest", () => {
         let result = await processString(hbs, context)
         // Trim 's
         js = js.replace(/^\'|\'$/g, "")
-        try {
-          let parsedExpected
-          if (
-            Array.isArray((parsedExpected = JSON.parse(js.replace(/\'/g, '"'))))
-          ) {
+        if ((parsedExpected = tryParseJson(js))) {
+          if (Array.isArray(parsedExpected)) {
             if (typeof parsedExpected[0] === "object") {
               js = JSON.stringify(parsedExpected)
             } else {
               js = parsedExpected.join(",")
             }
           }
-        } catch {}
+        }
         result = result.replace(/&nbsp;/g, " ")
         expect(result).toEqual(js)
       })

From 3ea8bfda91a2a2abd7ccd9fbd1364511f3a0644f Mon Sep 17 00:00:00 2001
From: Conor Webb <126772285+ConorWebb96@users.noreply.github.com>
Date: Wed, 24 Jan 2024 09:43:31 +0000
Subject: [PATCH 31/32] Modified planTitle function to accommodate old plans
 (#12854)

* Modified planTitle function to accommodate old plans

* Fixed liniting issues.
---
 packages/builder/src/helpers/planTitle.js | 26 ++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/helpers/planTitle.js b/packages/builder/src/helpers/planTitle.js
index dc07e8be2f..098bfb4529 100644
--- a/packages/builder/src/helpers/planTitle.js
+++ b/packages/builder/src/helpers/planTitle.js
@@ -1,11 +1,27 @@
 import { PlanType } from "@budibase/types"
 
 export function getFormattedPlanName(userPlanType) {
-  let planName = "Free"
-  if (userPlanType === PlanType.PREMIUM_PLUS) {
-    planName = "Premium"
-  } else if (userPlanType === PlanType.ENTERPRISE_BASIC) {
-    planName = "Enterprise"
+  let planName
+  switch (userPlanType) {
+    case PlanType.PRO:
+      planName = "Pro"
+      break
+    case PlanType.TEAM:
+      planName = "Team"
+      break
+    case PlanType.PREMIUM:
+    case PlanType.PREMIUM_PLUS:
+      planName = "Premium"
+      break
+    case PlanType.BUSINESS:
+      planName = "Business"
+      break
+    case PlanType.ENTERPRISE_BASIC:
+    case PlanType.ENTERPRISE:
+      planName = "Enterprise"
+      break
+    default:
+      planName = "Free" // Default to "Free" if the type is not explicitly handled
   }
   return `${planName} Plan`
 }

From 50e8d53ebfbfb95cabcf42a09db3b22b9200d75f Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Wed, 24 Jan 2024 12:24:48 +0200
Subject: [PATCH 32/32] Add TARGETBUILD to single image build script

---
 scripts/build-single-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-single-image.sh b/scripts/build-single-image.sh
index ba64d6121b..16b668e033 100755
--- a/scripts/build-single-image.sh
+++ b/scripts/build-single-image.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 yarn build --scope @budibase/server --scope @budibase/worker
 version=$(./scripts/getCurrentVersion.sh)
-docker build -f hosting/single/Dockerfile -t budibase:latest --build-arg BUDIBASE_VERSION=$version .
+docker build -f hosting/single/Dockerfile -t budibase:latest --build-arg BUDIBASE_VERSION=$version --build-arg TARGETBUILD=single .