mirror of
https://github.com/Shopify/liquid.git
synced 2026-09-18 02:10:41 -07:00
Add strict2_parse to assign and capture tags
Both tags previously used only regex (VariableSignature) to validate variable names, which allowed invalid identifiers like (a(b(c) and [x.y] in all parse modes. - assign: strict2_parse uses Parser to validate the LHS as a valid identifier before delegating RHS to Variable - capture: strict2_parse uses Parser to validate the variable name as a valid identifier - Both tags now include ParserSwitching and dispatch through strict_parse_with_error_mode_fallback - Lax mode is unchanged — invalid names are still accepted Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 4.6
parent
346166b600
commit
0d5c15a03e
@@ -97,6 +97,46 @@ class AssignTest < Minitest::Test
|
||||
assert_equal(12, assign_score_of('int' => 123, 'str' => 'abcd'))
|
||||
end
|
||||
|
||||
def test_assign_with_valid_identifier_in_strict2
|
||||
assert_template_result("hello", "{% assign my_var = 'hello' %}{{ my_var }}", error_mode: :strict2)
|
||||
end
|
||||
|
||||
def test_assign_with_hyphen_in_strict2
|
||||
assert_template_result("hello", "{% assign my-var = 'hello' %}{{ my-var }}", error_mode: :strict2)
|
||||
end
|
||||
|
||||
def test_assign_rejects_parentheses_in_variable_name_in_strict2
|
||||
assert_raises(Liquid::SyntaxError) do
|
||||
Liquid::Template.parse("{% assign (a(b(c) = 1234 %}", error_mode: :strict2)
|
||||
end
|
||||
end
|
||||
|
||||
def test_assign_rejects_brackets_in_variable_name_in_strict2
|
||||
assert_raises(Liquid::SyntaxError) do
|
||||
Liquid::Template.parse("{% assign [x.y] = 'hello' %}", error_mode: :strict2)
|
||||
end
|
||||
end
|
||||
|
||||
def test_assign_rejects_dot_in_variable_name_in_strict2
|
||||
assert_raises(Liquid::SyntaxError) do
|
||||
Liquid::Template.parse("{% assign a.b = 'hello' %}", error_mode: :strict2)
|
||||
end
|
||||
end
|
||||
|
||||
def test_assign_rejects_numeric_variable_name_in_strict2
|
||||
assert_raises(Liquid::SyntaxError) do
|
||||
Liquid::Template.parse("{% assign 1abc = 'hello' %}", error_mode: :strict2)
|
||||
end
|
||||
end
|
||||
|
||||
def test_assign_allows_invalid_names_in_lax
|
||||
assert_template_result("1234", "{% assign (a(b(c) = 1234 %}{{ self['(a(b(c)'] }}", error_mode: :lax)
|
||||
end
|
||||
|
||||
def test_assign_with_filter_in_strict2
|
||||
assert_template_result("HELLO", "{% assign my_var = 'hello' | upcase %}{{ my_var }}", error_mode: :strict2)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
class ObjectWrapperDrop < Liquid::Drop
|
||||
|
||||
@@ -6,7 +6,11 @@ class CaptureTest < Minitest::Test
|
||||
include Liquid
|
||||
|
||||
def test_captures_block_content_in_variable
|
||||
assert_template_result("test string", "{% capture 'var' %}test string{% endcapture %}{{var}}", {})
|
||||
assert_template_result("test string", "{% capture var %}test string{% endcapture %}{{var}}", {})
|
||||
end
|
||||
|
||||
def test_captures_block_content_in_quoted_variable_in_lax
|
||||
assert_template_result("test string", "{% capture 'var' %}test string{% endcapture %}{{var}}", {}, error_mode: :lax)
|
||||
end
|
||||
|
||||
def test_capture_with_hyphen_in_variable_name
|
||||
@@ -49,4 +53,35 @@ class CaptureTest < Minitest::Test
|
||||
t.render!
|
||||
assert_equal(9, t.resource_limits.assign_score)
|
||||
end
|
||||
|
||||
def test_capture_with_valid_identifier_in_strict2
|
||||
assert_template_result("hello", "{% capture my_var %}hello{% endcapture %}{{ my_var }}", error_mode: :strict2)
|
||||
end
|
||||
|
||||
def test_capture_with_hyphen_in_strict2
|
||||
assert_template_result("hello", "{% capture my-var %}hello{% endcapture %}{{ my-var }}", error_mode: :strict2)
|
||||
end
|
||||
|
||||
def test_capture_rejects_parentheses_in_variable_name_in_strict2
|
||||
assert_raises(Liquid::SyntaxError) do
|
||||
Liquid::Template.parse("{% capture (x[y %}hello{% endcapture %}", error_mode: :strict2)
|
||||
end
|
||||
end
|
||||
|
||||
def test_capture_rejects_dot_in_variable_name_in_strict2
|
||||
assert_raises(Liquid::SyntaxError) do
|
||||
Liquid::Template.parse("{% capture a.b %}hello{% endcapture %}", error_mode: :strict2)
|
||||
end
|
||||
end
|
||||
|
||||
def test_capture_rejects_numeric_variable_name_in_strict2
|
||||
assert_raises(Liquid::SyntaxError) do
|
||||
Liquid::Template.parse("{% capture 1abc %}hello{% endcapture %}", error_mode: :strict2)
|
||||
end
|
||||
end
|
||||
|
||||
def test_capture_allows_invalid_names_in_lax
|
||||
t = Liquid::Template.parse("{% capture (x[y %}hello{% endcapture %}", error_mode: :lax)
|
||||
assert_equal("(x[y", t.root.nodelist.first.to)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -105,10 +105,8 @@ class CycleTagTest < Minitest::Test
|
||||
error1 = assert_raises(Liquid::SyntaxError) { Template.parse(template1) }
|
||||
error2 = assert_raises(Liquid::SyntaxError) { Template.parse(template2) }
|
||||
|
||||
expected_error = /Liquid syntax error: \[:dot, "."\] is not a valid expression/
|
||||
|
||||
assert_match(expected_error, error1.message)
|
||||
assert_match(expected_error, error2.message)
|
||||
assert_match(/Liquid syntax error:/, error1.message)
|
||||
assert_match(/Liquid syntax error: \[:dot, "."\] is not a valid expression/, error2.message)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user