mirrors/django-components
1
0
Fork 0
mirror of https://github.com/django-components/django-components.git synced 2025-08-13 10:48:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: use the tag parser to streamline the tag handlers (#827)

Browse source
This commit is contained in:
Juro Oravec 2024-12-13 09:00:03 +01:00 • committed by GitHub
parent db4ca8b74f
commit 894dee3cad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 351 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/django_components/expression.py
View file

@ -169,10 +169,6 @@ def resolve_string(
return parser.compile_filter(s).resolve(context)
def is_kwarg(key: str) -> bool:
return "=" in key
def is_aggregate_key(key: str) -> bool:
# NOTE: If we get a key that starts with `:`, like `:class`, we do not split it.
# This syntax is used by Vue and AlpineJS.
@ -194,7 +190,7 @@ DYNAMIC_EXPR_RE = re.compile(
def is_dynamic_expression(value: Any) -> bool:
# NOTE: Currently dynamic expression need at least 6 characters
# for the opening and closing tags, and quotes
# for the opening and closing tags, and quotes, e.g. `"`, `{%`, `%}` in `" some text {% ... %}"`
MIN_EXPR_LEN = 6
if not isinstance(value, str) or not value or len(value) < MIN_EXPR_LEN:
@ -214,24 +210,6 @@ def is_spread_operator(value: Any) -> bool:
return value.startswith("...")
# A string that starts with `...1=`, `...29=`, etc.
# We convert the spread syntax to this, so Django parses
# it as a kwarg, so it remains in the original position.
#
# So from `...dict`, we make `...1=dict`
#
# That way it's trivial to merge the kwargs after the spread
# operator is replaced with actual values.
INTERNAL_SPREAD_OPERATOR_RE = re.compile(r"^\.\.\.\d+=")
def is_internal_spread_operator(value: Any) -> bool:
if not isinstance(value, str) or not value:
return False
return bool(INTERNAL_SPREAD_OPERATOR_RE.match(value))
def process_aggregate_kwargs(kwargs: Mapping[str, Any]) -> Dict[str, Any]:
"""
This function aggregates "prefixed" kwargs into dicts. "Prefixed" kwargs