Skip to content

fix: trim whitespace from contact variable fallbacks #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sarmah-rup wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: trim whitespace from contact variable fallbacks #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/web/src/server/utils/contact-variable-replacement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ export function replaceContactVariables(
return contactValue;
}

return fallback ?? "";
// The regex lets whitespace before `}}` fall into the fallback capture
return fallback?.trim() ?? "";
},
);
}
15 changes: 15 additions & 0 deletions apps/web/src/server/utils/contact-variable-replacement.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ describe("replaceContactVariables", () => {
).toBe("Welcome, you!");
});

it("does not keep whitespace padding in the fallback value", () => {
const contact = {
...baseContact,
firstName: null,
} satisfies Contact;

expect(
replaceContactVariables(
"Hi {{ firstName, fallback= there }}, welcome!",
contact,
[...BUILT_IN_CONTACT_VARIABLES],
),
).toBe("Hi there, welcome!");
});

it("uses fallback values for nullable built-in variables", () => {
const contact = {
...baseContact,
Expand Down