StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-18 15:00:00 +00:00
Code Releases Activity

templateFormatter: fix empty string args not getting counted as arguments; add concat base template function

Browse source
This commit is contained in:
Dragory 2019-03-16 16:39:07 +02:00
parent f7f08ffd3b
commit 8f898ed972
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/templateFormatter.test.ts
View file

@ -99,3 +99,13 @@ test("Edge case #1", async () => {
const result = await renderTemplate("{foo} {bar()}"); const result = await renderTemplate("{foo} {bar()}");
// No "Unclosed function" exception = success // No "Unclosed function" exception = success
}); });
test("Parses empty string args as empty strings", async () => {
const result = parseTemplate('{foo("")}');
expect(result).toEqual([
{
identifier: "foo",
args: [""],
},
]);
});

5
src/templateFormatter.ts
View file

@ -59,7 +59,7 @@ export function parseTemplate(str: string): ParsedTemplate {
const dumpArg = () => { const dumpArg = () => {
if (!currentVar) return; if (!currentVar) return;
if (currentVar._state.currentArg !== null && currentVar._state.currentArg !== "") { if (currentVar._state.currentArgType) {
if (currentVar._state.currentArgType === "number") { if (currentVar._state.currentArgType === "number") {
if (isNaN(currentVar._state.currentArg as any)) { if (isNaN(currentVar._state.currentArg as any)) {
throw new TemplateParseError(`Invalid numeric argument: ${currentVar._state.currentArg}`); throw new TemplateParseError(`Invalid numeric argument: ${currentVar._state.currentArg}`);
@ -272,6 +272,9 @@ const baseValues = {
not(arg) { not(arg) {
return !arg; return !arg;
}, },
concat(...args) {
return [...args].join("");
},
}; };
export async function renderTemplate(template: string, values = {}, includeBaseValues = true) { export async function renderTemplate(template: string, values = {}, includeBaseValues = true) {