Skip to content

feat(tojson): accept ensure_ascii kwarg for Jinja compatibility #84

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

feat(tojson): accept ensure_ascii kwarg for Jinja compatibility #84

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
11 changes: 9 additions & 2 deletions include/minja/minja.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2725,8 +2725,15 @@ inline std::shared_ptr<Context> Context::builtins() {
globals.set("raise_exception", simple_function("raise_exception", { "message" }, [](const std::shared_ptr<Context> &, Value & args) -> Value {
throw std::runtime_error(args.at("message").get<std::string>());
}));
globals.set("tojson", simple_function("tojson", { "value", "indent" }, [](const std::shared_ptr<Context> &, Value & args) {
return Value(args.at("value").dump(args.get<int64_t>("indent", -1), /* to_json= */ true));
// Accept optional keyword arguments to match common Jinja usage such as
// tojson(indent=2) and tojson(ensure_ascii=False). The ensure_ascii flag
// is ignored since nlohmann::json dumps UTF-8 by default, but it is
// accepted for compatibility to avoid "Unknown argument" errors.
globals.set("tojson", simple_function("tojson", { "value", "indent", "ensure_ascii" }, [](const std::shared_ptr<Context> &, Value & args) {
// Read indent if provided; ignore ensure_ascii if present.
const auto indent = args.get<int64_t>("indent", -1);
// bool ensure_ascii = args.get<bool>("ensure_ascii", true); // unused
return Value(args.at("value").dump(indent, /* to_json= */ true));
}));
globals.set("items", simple_function("items", { "object" }, [](const std::shared_ptr<Context> &, Value & args) {
auto items = Value::array();
Expand Down
2 changes: 2 additions & 0 deletions tests/test-syntax.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ TEST(SyntaxTest, SimpleCases) {
EXPECT_EQ("bcXYZab", render("{{ 'abcXYZabc'.strip('ac') }}", {}, {}));

EXPECT_EQ(R"(["a", "b"])", render("{{ 'a b'.split(' ') | tojson }}", {}, {}));
// Accept ensure_ascii kwarg for compatibility, ignored by implementation
EXPECT_EQ(R"("test")", render(R"({{ 'test' | tojson(ensure_ascii=False) }})", {}, {}));

EXPECT_EQ(
"Ok",
Expand Down