From c417a5e627a78c35e1b781ef1d3f0486b5ebaf4d Mon Sep 17 00:00:00 2001
From: Peter Clement <PClmnt@users.noreply.github.com>
Date: Fri, 28 Jun 2024 14:18:15 +0100
Subject: [PATCH] Replace multiple spaces in bindings with one space (#14018)

* replace multiple spaces in bindings with one space

* add some tests and update regex to account for strings

* update regex to character based approach

* simplify regex to only look for spaces after {{

---------

Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
---
 .../src/processors/preprocessor.ts             |  4 ++++
 packages/string-templates/test/basic.spec.ts   | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/packages/string-templates/src/processors/preprocessor.ts b/packages/string-templates/src/processors/preprocessor.ts
index 010c259e12..5e96336e32 100644
--- a/packages/string-templates/src/processors/preprocessor.ts
+++ b/packages/string-templates/src/processors/preprocessor.ts
@@ -7,6 +7,7 @@ export const PreprocessorNames = {
   SWAP_TO_DOT: "swap-to-dot-notation",
   FIX_FUNCTIONS: "fix-functions",
   FINALISE: "finalise",
+  NORMALIZE_SPACES: "normalize-spaces",
 }
 
 class Preprocessor {
@@ -50,6 +51,9 @@ export const processors = [
     return statement
   }),
 
+  new Preprocessor(PreprocessorNames.NORMALIZE_SPACES, (statement: string) => {
+    return statement.replace(/{{(\s{2,})/g, "{{ ")
+  }),
   new Preprocessor(
     PreprocessorNames.FINALISE,
     (statement: string, opts: { noHelpers: any }) => {
diff --git a/packages/string-templates/test/basic.spec.ts b/packages/string-templates/test/basic.spec.ts
index ddea54c2bf..24a19131f4 100644
--- a/packages/string-templates/test/basic.spec.ts
+++ b/packages/string-templates/test/basic.spec.ts
@@ -320,3 +320,21 @@ describe("should leave HBS blocks if not found using option", () => {
     expect(output).toBe("{{ a }}, 1")
   })
 })
+
+describe("check multiple space behaviour", () => {
+  it("should remove whitespace and use the helper correctly", async () => {
+    const output = await processString("{{   add   num1   num2 }}", {
+      num1: 1,
+      num2: 2,
+    })
+    expect(output).toEqual("3")
+  })
+
+  it("should ensure that whitespace within a string is respected", async () => {
+    const output = await processString("{{ trimRight 'test   string  ' }}", {
+      num1: 1,
+      num2: 2,
+    })
+    expect(output).toEqual("test   string")
+  })
+})