refactor: replace deprecated resolve_value with Component.resolve

Author: m-xim

example/custom_components/aiogram_i18n.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional, Mapping
 
-from textcompose.core import resolve_value, Condition, Value
+from textcompose.core import Condition, Value
 from textcompose.elements.base import Element
 
 
@@ -21,7 +21,7 @@ def __init__(
     def _resolve_mapping(self, context: Mapping[str, Any]) -> Mapping[str, Any]:
         resolved = {}
         for key, val in self.mapping.items():
-            result = resolve_value(val, context)
+            result = self.resolve(val, context)
             resolved[key] = result if result is not None else ""
         return resolved
 
@@ -31,9 +31,9 @@ def render(self, context, **kwargs) -> Optional[str]:
 
         i18n = kwargs.get("i18n")
         if i18n is None:
-            raise ValueError("Missing 'i18n' in render kwargs")
+            raise ValueError(f"Missing 'i18n' in render kwargs (key={self.text})")
 
         params = self._resolve_mapping(context)
-        locale = resolve_value(self.locale, context) if self.locale else None
+        locale = self.resolve(self.locale, context) if self.locale else None
 
         return i18n.get(self.text, locale, **params)

textcompose/containers/group.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from textcompose.containers.base import Container
-from textcompose.core import Value, Condition, resolve_value
+from textcompose.core import Value, Condition
 
 
 class Group(Container):
@@ -15,6 +15,6 @@ def render(self, context, **kwargs) -> str | None:
 
         parts = []
         for comp in self.items:
-            if (part := resolve_value(comp, context, **kwargs)) is not None:
+            if (part := self.resolve(comp, context, **kwargs)) is not None:
                 parts.append(part)
         return self.sep.join(parts) if parts else None

textcompose/containers/list.py

@@ -21,17 +21,15 @@ def __init__(
         self.sep = sep
         self.inner_sep = inner_sep
 
-    def _render_item(self, item_value: Any, context: Mapping[str, Any], **kwargs) -> str | None:
-        rendered_parts = [
-            resolve_value(item_tpl, {"item": item_value, "context": context}, **kwargs) for item_tpl in self.items
-        ]
+    def _render_item(self, context: Mapping[str, Any], **kwargs) -> str | None:
+        rendered_parts = [self.resolve(item_tpl, context, **kwargs) for i, item_tpl in enumerate(self.items)]
         return self.inner_sep.join(filter(None, rendered_parts)) or None
 
     def render(self, context, **kwargs) -> str | None:
         if not self._check_when(context, **kwargs):
             return None
 
-        items_iterable = resolve_value(self.getter, context, **kwargs)
+        items_iterable = self.resolve(self.getter, context, **kwargs)
         if not items_iterable:
             return None
 

textcompose/core/component.py

@@ -1,15 +1,26 @@
 from abc import ABC, abstractmethod
-from typing import Any, Mapping
+from typing import Any, Mapping, Callable
+
+from magic_filter import MagicFilter
 
 # Direct import to prevent circular import issues
-from textcompose.core.resolvers import resolve_value
 from textcompose.core.types import Condition
 
 
 class Component(ABC):
     def __init__(self, when: Condition | None = None) -> None:
         self.when = when
 
+    @staticmethod
+    def resolve(value, context: Mapping[str, Any], **kwargs) -> str | None:
+        if isinstance(value, MagicFilter):
+            return value.resolve(context)
+        elif hasattr(value, "render") and callable(getattr(value, "render")):
+            return value.render(context, **kwargs)
+        elif isinstance(value, Callable):
+            return value(context)
+        return value
+
     def _check_when(self, context: Mapping[str, Any], **kwargs) -> bool:
         if self.when is None:
             return True
@@ -18,7 +29,7 @@ def _check_when(self, context: Mapping[str, Any], **kwargs) -> bool:
         if isinstance(self.when, str):
             return bool(context.get(self.when))
 
-        return bool(resolve_value(value=self.when, context=context, **kwargs))
+        return bool(self.resolve(value=self.when, context=context, **kwargs))
 
     @abstractmethod
     def render(self, context: Mapping[str, Any], **kwargs) -> str | None: ...

textcompose/core/resolvers.py

@@ -1,13 +1,13 @@
-from typing import Callable, Mapping, Any
-
-from magic_filter import MagicFilter
+import warnings
+from typing import Mapping, Any
+from textcompose.core import Component
 
 
 def resolve_value(value, context: Mapping[str, Any], **kwargs) -> str | None:
-    if isinstance(value, MagicFilter):
-        return value.resolve(context)
-    elif hasattr(value, "render") and callable(getattr(value, "render")):
-        return value.render(context, **kwargs)
-    elif isinstance(value, Callable):
-        return value(context)
-    return value
+    warnings.warn(
+        "resolve_value is deprecated and will be removed in future versions. Use Component.resolve instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+
+    return Component.resolve(value, context, **kwargs)

textcompose/elements/progress_bar.py

@@ -1,4 +1,4 @@
-from textcompose.core import Condition, Value, resolve_value
+from textcompose.core import Condition, Value
 from textcompose.elements.base import Element
 from textcompose.styles.progress_bar import PROGRESS_BAR_STYLES, ProgressBarStyle
 
@@ -27,24 +27,24 @@ def render(self, context, **kwargs) -> str | None:
             style_obj = PROGRESS_BAR_STYLES.get(self.style, None)
         else:
             style_obj = ProgressBarStyle(
-                left=resolve_value(self.style.left, context),
-                fill=resolve_value(self.style.fill, context),
-                empty=resolve_value(self.style.empty, context),
-                right=resolve_value(self.style.right, context),
+                left=self.resolve(self.style.left, context),
+                fill=self.resolve(self.style.fill, context),
+                empty=self.resolve(self.style.empty, context),
+                right=self.resolve(self.style.right, context),
             )
             if self.style.template is not None:
-                style_obj.template = resolve_value(self.style.template, context)
+                style_obj.template = self.resolve(self.style.template, context)
 
         if style_obj is None:
             raise ValueError(f"Unknown style: {self.style}. Available styles: {', '.join(PROGRESS_BAR_STYLES.keys())}")
 
-        length = int(resolve_value(self.width, context))
+        length = int(self.resolve(self.width, context))
         if length <= 0:
             raise ValueError("Progress bar length must be a positive integer.")
-        current = float(resolve_value(self.current, context))
+        current = float(self.resolve(self.current, context))
         if current < 0:
             raise ValueError("Current value must be non-negative.")
-        total = float(resolve_value(self.total, context))
+        total = float(self.resolve(self.total, context))
         if total <= 0:
             raise ValueError("Total value must be greater than zero.")
 

textcompose/logics/if_then_else.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from textcompose.core import Condition, Value, resolve_value
+from textcompose.core import Condition, Value
 from textcompose.logics.base import Logic
 
 
@@ -21,6 +21,6 @@ def render(self, context, **kwargs) -> Optional[str]:
         if not self._check_when(context, **kwargs):
             return None
 
-        if bool(resolve_value(value=self.if_, context=context, **kwargs)):
-            return resolve_value(self.then_, context, **kwargs)
-        return resolve_value(self.else_, context, **kwargs)
+        if bool(self.resolve(value=self.if_, context=context, **kwargs)):
+            return self.resolve(self.then_, context, **kwargs)
+        return self.resolve(self.else_, context, **kwargs)

textcompose/template.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from textcompose.containers.base import Container
-from textcompose.core import Component, Condition, resolve_value
+from textcompose.core import Component, Condition
 
 
 class Template(Container):
@@ -16,7 +16,7 @@ def render(self, context, **kwargs) -> str:
 
         parts = []
         for comp in self.items:
-            if (part := resolve_value(comp, context, **kwargs)) is not None:
+            if (part := self.resolve(comp, context, **kwargs)) is not None:
                 parts.append(part)
 
         return self.sep.join(parts).strip()