Skip to content

Fix #40 - Add a convenience case for string arrays in HTML attributes #41

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #40 - Add a convenience case for string arrays in HTML attributes #41

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
21 changes: 21 additions & 0 deletions source/diet/html.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,14 @@ unittest {
);
test!".foo"("<div class=\"foo\"></div>");
test!"#foo"("<div id=\"foo\"></div>");

// Issue 40: convenience case for string arrays in HTML attributes
test!`- auto a = ["public"];
foo(class="#{a}")`
(`<foo class="public"></foo>`);
test!`- auto a = ["a", "b"];
foo(class="#{a}")`
(`<foo class="a b"></foo>`);
}


Expand Down Expand Up @@ -335,20 +343,33 @@ private string getElementMixin(ref CTX ctx, in Node node, bool in_pre)
}

ret ~= ctx.statement(node.loc, q{
// special case: bool
static if (is(typeof(() { return %s; }()) == bool) )
}~'{', expr);
if (ctx.isHTML5)
ret ~= ctx.statement(node.loc, q{if (%s) %s.put(" %s");}, expr, ctx.rangeName, att.name);
else
ret ~= ctx.statement(node.loc, q{if (%s) %s.put(" %s=\"%s\"");}, expr, ctx.rangeName, att.name, att.name);

// special case: string
ret ~= ctx.statement(node.loc, "} else "~q{static if (is(typeof(%s) : const(char)[])) }~"{{", expr);
ret ~= ctx.statement(node.loc, q{ auto _diet_val = %s;}, expr);
ret ~= ctx.statement(node.loc, q{ if (_diet_val !is null) }~'{');
ret ~= ctx.rawText(node.loc, " "~att.name~"=\"");
ret ~= ctx.statement(node.loc, q{ %s.filterHTMLAttribEscape(_diet_val);}, ctx.rangeName);
ret ~= ctx.rawText(node.loc, "\"");
ret ~= ctx.statement(node.loc, " }");

// special case: string[]
ret ~= ctx.statement(node.loc, "}} else static if (is(typeof(%s) : string[])) {{", expr);
ret ~= ctx.statement(node.loc, "auto val = %s;", expr);
ret ~= ctx.statement(node.loc, "import std.array : join;");
ret ~= ctx.statement(node.loc, "if (val !is null) { ");
ret ~= ctx.rawText(node.loc, " " ~ att.name~`="`);
ret ~= ctx.statement(node.loc, `%s.filterHTMLAttribEscape(val.join(" "));`, ctx.rangeName);
ret ~= ctx.rawText(node.loc, `"`);
ret ~= ctx.statement(node.loc, " }");

ret ~= ctx.statement(node.loc, "}} else {");
}

Expand Down