laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle VarData roundtrip when encoded value contains newline (#2350)

Browse Source
This commit is contained in:
Masen Furer 2024-01-03 10:46:22 -07:00 committed by GitHub
parent accaf6dc52
commit 414a879879
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reflex/vars.py
View File

@ -209,7 +209,11 @@ def _decode_var(value: str) -> tuple[VarData | None, str]:
var_datas = [] var_datas = []
if isinstance(value, str): if isinstance(value, str):
# Extract the state name from a formatted var # Extract the state name from a formatted var
while m := re.match(r"(.*)<reflex.Var>(.*)</reflex.Var>(.*)", value): while m := re.match(
pattern=r"(.*)<reflex.Var>(.*)</reflex.Var>(.*)",
string=value,
flags=re.DOTALL, # Ensure . matches newline characters.
):
value = m.group(1) + m.group(3) value = m.group(1) + m.group(3)
try: try:
var_datas.append(VarData.parse_raw(m.group(2))) var_datas.append(VarData.parse_raw(m.group(2)))

17
tests/test_var.py
View File

@ -638,9 +638,20 @@ def test_extract_state_from_container(value, expect_state):
assert Var.create_safe(value)._var_state == expect_state assert Var.create_safe(value)._var_state == expect_state
def test_fstring_roundtrip(): @pytest.mark.parametrize(
"""Test that f-string roundtrip carries state.""" "value",
var = BaseVar.create_safe("var")._var_set_state("state") [
"var",
"\nvar",
],
)
def test_fstring_roundtrip(value):
"""Test that f-string roundtrip carries state.
Args:
value: The value to create a Var from.
"""
var = BaseVar.create_safe(value)._var_set_state("state")
rt_var = Var.create_safe(f"{var}") rt_var = Var.create_safe(f"{var}")
assert var._var_state == rt_var._var_state assert var._var_state == rt_var._var_state
assert var._var_full_name_needs_state_prefix assert var._var_full_name_needs_state_prefix