Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Path population on ZonIssue instances for better tracking what caused an error.

## [3.0.0] - 2025-05-16

### Changed
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ black==24.3.0
build==1.0.3
pylint==3.0.2
pytest==7.4.3
twine==4.0.2
twine
validators==0.28.3
typing_extensions==4.12.2
pytest-cov==5.0.0
pytest-cov==5.0.0
pylint-pytest==1.1.8
6 changes: 0 additions & 6 deletions tests/enum_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ def test_enum_safe_validate(validator):


def test_enum_exclude(validator):

# TODO: test through validation

assert validator.exclude(["1"]).enum == {"2", "3", "4", "5"}
assert validator.exclude(["2"]).enum == {"1", "3", "4", "5"}
assert validator.exclude(["3"]).enum == {"1", "2", "4", "5"}
Expand All @@ -51,9 +48,6 @@ def test_enum_exclude(validator):


def test_enum_extract(validator):

# TODO: test through validation

assert validator.extract(["1"]).enum == {
"1",
}
Expand Down
36 changes: 34 additions & 2 deletions tests/list_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ def test_list_get_element(element_validator):


class TestElementListOuterFunction:

@pytest.fixture
def validator(self, element_validator):
return zon.element_list(element_validator)
Expand Down Expand Up @@ -75,7 +74,6 @@ def test_list_max(self, validator):


class TestElementListMethod:

@pytest.fixture
def validator(self, element_validator):
return element_validator.list()
Expand Down Expand Up @@ -134,3 +132,37 @@ def test_list_max(self, validator):

with pytest.raises(zon.error.ZonError):
_validator.validate(["1", "2", "3"])


def test_list_error_paths(element_validator):
"""Test that validation errors for list elements have correct paths"""
validator = zon.element_list(
element_validator.min(2)
) # Require strings with min length 2

# Test single element validation error
result = validator.safe_validate(["valid", "x"]) # Second string too short
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["1"]

# Test multiple element validation errors
result = validator.safe_validate(["x", "y", "valid"]) # First two strings too short
assert result[0] is False
issues = result[1].issues
assert len(issues) == 2
paths = [issue.path for issue in issues]
assert ["0"] in paths
assert ["1"] in paths

# Test with wrong type element
result = validator.safe_validate(["valid", 123]) # Second element not a string
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["1"]

# Test empty list - should be valid (no elements to validate)
result = validator.safe_validate([])
assert result[0] is True
253 changes: 253 additions & 0 deletions tests/path_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
import pytest

import zon


def test_nested_record_in_record_paths():
"""Test path population for nested records within records"""
# Create nested record structure: user -> address -> street
address_validator = zon.record(
{
"street": zon.string().min(5),
"city": zon.string(),
}
)

user_validator = zon.record(
{
"name": zon.string(),
"address": address_validator,
}
)

# Test nested error path
result = user_validator.safe_validate(
{
"name": "John",
"address": {
"street": "x", # Too short (violates min(5))
"city": "NYC",
},
}
)
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["address", "street"]


def test_nested_list_in_record_paths():
"""Test path population for lists within records"""
# Record containing a list of strings
user_validator = zon.record(
{
"name": zon.string(),
"hobbies": zon.string().list().min(1), # Non-empty list of strings
}
)

# Test list element error within record
result = user_validator.safe_validate(
{
"name": "John",
"hobbies": ["reading", 123, "coding"], # Second element wrong type
}
)
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["hobbies", "1"]

# Test multiple list element errors within record
result = user_validator.safe_validate(
{
"name": "John",
"hobbies": [123, 456, "coding"], # First two elements wrong type
}
)
assert result[0] is False
issues = result[1].issues
assert len(issues) == 2
paths = [issue.path for issue in issues]
assert ["hobbies", "0"] in paths
assert ["hobbies", "1"] in paths


def test_nested_record_in_list_paths():
"""Test path population for records within lists"""
# List of user records
user_record = zon.record(
{
"name": zon.string().min(1), # Require at least 1 character
"age": zon.number().int().positive(),
}
)
users_validator = user_record.list()

# Test record field error within list
result = users_validator.safe_validate(
[
{"name": "John", "age": 25},
{"name": "Jane", "age": -5}, # Negative age
]
)
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["1", "age"]

# Test multiple record errors within list
result = users_validator.safe_validate(
[
{"name": "", "age": 25}, # Empty name
{"name": "Jane", "age": -5}, # Negative age
]
)
assert result[0] is False
issues = result[1].issues
assert len(issues) == 2
paths = [issue.path for issue in issues]
assert ["0", "name"] in paths
assert ["1", "age"] in paths


def test_deeply_nested_structure_paths():
"""Test path population for deeply nested structures"""
# Create a deeply nested structure: company -> departments -> employees -> address
address_validator = zon.record(
{
"street": zon.string(),
"zip": zon.string().regex(r"^\d{5}$"),
}
)

employee_validator = zon.record(
{
"name": zon.string(),
"address": address_validator,
}
)

department_validator = zon.record(
{
"name": zon.string(),
"employees": employee_validator.list(),
}
)

company_validator = zon.record(
{
"name": zon.string(),
"departments": department_validator.list(),
}
)

# Test very deeply nested error
result = company_validator.safe_validate(
{
"name": "TechCorp",
"departments": [
{
"name": "Engineering",
"employees": [
{
"name": "Alice",
"address": {
"street": "123 Main St",
"zip": "123", # Invalid zip code (not 5 digits)
},
}
],
}
],
}
)
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["departments", "0", "employees", "0", "address", "zip"]


def test_tuple_in_record_paths():
"""Test path population for tuples within records"""
# Record containing a tuple
person_validator = zon.record(
{
"name": zon.string(),
"coordinates": zon.element_tuple(
[zon.number(), zon.number()]
), # (x, y) coordinates
}
)

# Test tuple element error within record
result = person_validator.safe_validate(
{
"name": "John",
"coordinates": (10.5, "not_a_number"), # Second element wrong type
}
)
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["coordinates", "1"]


def test_list_in_tuple_paths():
"""Test path population for lists within tuples"""
# Tuple containing a list
order_validator = zon.element_tuple(
[
zon.string(), # order_id
zon.string().list(), # items
]
)

# Test list element error within tuple
result = order_validator.safe_validate(("order123", ["item1", 123, "item3"]))
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["1", "1"] # Tuple index 1, list index 1


def test_optional_nested_structure_paths():
"""Test path population for optional nested structures"""
# Optional nested record
optional_address_validator = zon.record(
{
"street": zon.string(),
"city": zon.string(),
}
).optional()

user_validator = zon.record(
{
"name": zon.string(),
"address": optional_address_validator,
}
)

# Test error in optional nested structure
result = user_validator.safe_validate(
{
"name": "John",
"address": {
"street": "123 Main St",
"city": 123, # Wrong type
},
}
)
assert result[0] is False
issues = result[1].issues
assert len(issues) == 1
assert issues[0].path == ["address", "city"]

# Test with None (should be valid for optional)
result = user_validator.safe_validate(
{
"name": "John",
"address": None,
}
)
assert result[0] is True
Loading
Loading