feat!: release version 1.0.0

BREAKING CHANGE: Introduced changes that break backward compatibility.

Author: m-xim

.github/workflows/release.yml

@@ -22,14 +22,14 @@ jobs:
 
       - name: Action | Semantic Version Release
         id: release
-        uses: python-semantic-release/python-semantic-release@v9.21.0
+        uses: python-semantic-release/python-semantic-release@v10.0.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           git_committer_name: "github-actions"
           git_committer_email: "actions@users.noreply.github.com"
 
       - name: Publish | Upload to GitHub Release Assets
-        uses: python-semantic-release/publish-action@v9.21.0
+        uses: python-semantic-release/publish-action@v10.0.2
         if: steps.release.outputs.released == 'true'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

@@ -37,5 +37,4 @@ jobs:
 
       - name: Run pytest
         run: |
-          uv pip install .
           uv run pytest

CHANGELOG.md

@@ -1,174 +0,0 @@
-# CHANGELOG
-
-
-## v0.6.1 (2025-05-08)
-
-### Bug Fixes
-
-- **content**: Remove debug print statement and ensure proper handling of empty parts in rendering
-  ([`0393f2a`](https://github.com/m-xim/textcompose/commit/0393f2aa19342f82ce7c88e465dbde3272c5a175))
-
-
-## v0.6.0 (2025-05-08)
-
-### Features
-
-- **template**: Add separator option to Template for customizable rendering
-  ([`a25b9b5`](https://github.com/m-xim/textcompose/commit/a25b9b55d22e9bdcc8ae5a2b2bebd950734baa0d))
-
-
-## v0.5.0 (2025-05-08)
-
-### Features
-
-- **logical**: Add If class for conditional rendering logic
-  ([`459e0e1`](https://github.com/m-xim/textcompose/commit/459e0e104cc2a3cb7436765d6b3f70795584d931))
-
-
-## v0.4.0 (2025-05-04)
-
-### Documentation
-
-- Update README to enhance section headings with emojis
-  ([`2b48887`](https://github.com/m-xim/textcompose/commit/2b48887aa1bb59cc5969cc53ba6ccdedf3bc693e))
-
-### Features
-
-- **content**: Update Value type to support callable for dynamic value resolution
-  ([`2c90531`](https://github.com/m-xim/textcompose/commit/2c9053145eaa2b53ca044406bdae998a909e582d))
-
-
-## v0.3.0 (2025-05-03)
-
-### Bug Fixes
-
-- **content**: Resolve circular import by moving resolve_value to BaseContent
-  ([`a320b19`](https://github.com/m-xim/textcompose/commit/a320b19cc4115cce406e900bee67f7e0e87147ce))
-
-### Features
-
-- Add resolve_value and extend support for dynamic types in group, and template
-  ([`e5bfaeb`](https://github.com/m-xim/textcompose/commit/e5bfaeb7ebb470483719eaef9354c8b08a7eac6a))
-
-
-## v0.2.0 (2025-05-02)
-
-### Chores
-
-- **release**: Fix
-  ([`365ad02`](https://github.com/m-xim/textcompose/commit/365ad025db2b580e16941d207491a18560034573))
-
-- **release**: Migrate to single-branch workflow and manual release process
-  ([`add9991`](https://github.com/m-xim/textcompose/commit/add9991277ceaa84afc324cace9d894b50a308c2))
-
-### Features
-
-- Custom arg in render
-  ([`94fc405`](https://github.com/m-xim/textcompose/commit/94fc405c44f3aafa34a55dabf7d56374ee1ab45f))
-
-
-## v0.1.4 (2025-05-02)
-
-
-## v0.1.4-rc.1 (2025-05-02)
-
-### Chores
-
-- **readme**: Fix pypi badge
-  ([`bd30d8d`](https://github.com/m-xim/textcompose/commit/bd30d8dee487d5f717cae2275a3687488dfb58b4))
-
-
-## v0.1.3 (2025-05-02)
-
-### Chores
-
-- **release**: Add project metadata
-  ([`727d910`](https://github.com/m-xim/textcompose/commit/727d9109f66f129cccd4a1263036dc8888b376b7))
-
-### Continuous Integration
-
-- Set committer
-  ([`d2e1cff`](https://github.com/m-xim/textcompose/commit/d2e1cff651e9fc13a12c6e6cd95584426d4df645))
-
-
-## v0.1.3-rc.2 (2025-05-02)
-
-### Bug Fixes
-
-- **Container**: `*children`, `when` is name arg
-  ([`5d726e5`](https://github.com/m-xim/textcompose/commit/5d726e548691162f38737c4d31903725c63b05d1))
-
-### Continuous Integration
-
-- Cleaning
-  ([`17fb568`](https://github.com/m-xim/textcompose/commit/17fb5687113d3f0c3694e963ae153409bc7d4279))
-
-- Fix pip
-  ([`71c2d0f`](https://github.com/m-xim/textcompose/commit/71c2d0ffef0e8c85da1c9b89fb6c84568dd81624))
-
-- Fix pytest
-  ([`429e0ba`](https://github.com/m-xim/textcompose/commit/429e0ba95c17bc858ab47db9901a75df24ee4b04))
-
-- Fix uv sync
-  ([`6152b99`](https://github.com/m-xim/textcompose/commit/6152b99f0155d902096af632a216aed8be8d7d7d))
-
-### Testing
-
-- Add tests
-  ([`fa30176`](https://github.com/m-xim/textcompose/commit/fa301760d5734d249c5c7c59a7f9f954de6bf0c4))
-
-
-## v0.1.3-rc.1 (2025-05-01)
-
-### Bug Fixes
-
-- **Text**: Condition
-  ([`1d9dca2`](https://github.com/m-xim/textcompose/commit/1d9dca26f2c2f6c41416c9009a29e3c002feef50))
-
-### Continuous Integration
-
-- Rename
-  ([`a3737ed`](https://github.com/m-xim/textcompose/commit/a3737ed9b72de9d9d245bb2398616f9b0822254b))
-
-### Documentation
-
-- Add README
-  ([`0ef408e`](https://github.com/m-xim/textcompose/commit/0ef408e808bbde043c5ef12c3928e006b0631183))
-
-
-## v0.1.2 (2025-05-01)
-
-### Bug Fixes
-
-- Bump version for re-upload
-  ([`10e3415`](https://github.com/m-xim/textcompose/commit/10e34150ca94eec75af46fe3bbda121a4b97b802))
-
-
-## v0.1.1 (2025-05-01)
-
-### Bug Fixes
-
-- Lock
-  ([`1811f28`](https://github.com/m-xim/textcompose/commit/1811f28b954106735e1e28d513378a426fb11c15))
-
-- Lock
-  ([`6d4b44c`](https://github.com/m-xim/textcompose/commit/6d4b44c8719a45f52834391777d5b98af452a36f))
-
-- Lock
-  ([`fbdcd6c`](https://github.com/m-xim/textcompose/commit/fbdcd6caf211c7a6a33ac6acc4a08a2e8bcdeb8f))
-
-- Release.yml
-  ([`6a51a9d`](https://github.com/m-xim/textcompose/commit/6a51a9d68cf05e38576de6c29b3244a33fe21a9d))
-
-
-## v0.1.0 (2025-05-01)
-
-### Bug Fixes
-
-- Release.yml
-  ([`67e6c54`](https://github.com/m-xim/textcompose/commit/67e6c54ca966465eae6614b3f8af2bdd62f4c877))
-
-### Features
-
-- Init project
-  ([`da750ca`](https://github.com/m-xim/textcompose/commit/da750ca2c3470d1a4a337af533f68221f3cf4807))

README.md

@@ -18,7 +18,7 @@
 - Formatting via f-string and Jinja2
 - Easily extensible with new components
 
----
+
 
 ## 🚀 Installation
 
@@ -35,50 +35,47 @@ uv add textcompose
 pip install textcompose
 ```
 
----
-
 
 ## 💻 Usage
 
 ### Components Overview
 
 #### General
 
-- `Template` — combines and renders components as a structured text block.
-
-#### Content Blocks
+- `Template` — main class for combining and rendering components
 
-- `BaseContent` — abstract base class for all content components
 
+#### Elements
+`Element` — abstract base class for all element components
 
 - `Text` — outputs static text
 - `Format` — dynamic formatting via f-string
 - `Jinja` — rendering via Jinja2 templates
 
 #### Containers
+`Container` — abstract base class for all container components
 
-- `BaseContainer` — abstract base class for containers
-
-
-- `Group` — groups children with a separator
+- `Group` — groups child components with a separator
 - `List` — repeats a template for a collection
 
 #### Logic Components
+`Logic` — abstract base class for all container components
 
 - `If` — conditional rendering (`if_`, `then_`, `else_`)
 
-All components support the `when` parameter for conditional rendering.
-
 ---
+All components support the `when` parameter — it controls the display of the component and accepts a condition (expression, function or magic_filter).
 
 ## 📝 Example
 
+All usage examples can be found in the [`example`](./example) folder.
+
 ```python
 from magic_filter import F
 
 from textcompose import Template
 from textcompose.container import Group, List
-from textcompose.content import Format, Text, Jinja
+from textcompose.elements import Format, Jinja, Text
 from textcompose.logic import If
 
 template = Template(
@@ -136,4 +133,4 @@ Thank you for using our service!
 
 ## 👨‍💻 Contributing
 
-We welcome contributions to `TextCompose`. If you have suggestions or improvements, please open an issue or submit a pull request.
+Contributions are welcome! If you have suggestions or improvements, please open an issue or submit a pull request.

example/base.py

@@ -2,7 +2,7 @@
 
 from textcompose import Template
 from textcompose.container import Group, List
-from textcompose.content import Format, Text, Jinja
+from textcompose.elements import Format, Jinja, Text
 from textcompose.logic import If
 
 template = Template(

example/custom_component/aiogram_i18n.py

@@ -1,8 +1,10 @@
-from typing import Dict, Any, Optional
-from textcompose.content.content import BaseContent, Condition, Value
+from typing import Any, Optional, Mapping
 
+from textcompose.core import resolve_value, Condition, Value
+from textcompose.elements.base import Element
 
-class I18nTC(BaseContent):
+
+class I18nTC(Element):
     def __init__(
         self,
         text: str,
@@ -16,14 +18,14 @@ def __init__(
         self.locale = locale
         self.mapping = mapping
 
-    def _resolve_mapping(self, context: Dict[str, Any]) -> Dict[str, Any]:
+    def _resolve_mapping(self, context: Mapping[str, Any]) -> Mapping[str, Any]:
         resolved = {}
         for key, val in self.mapping.items():
-            result = self.resolve_value(val, context)
+            result = resolve_value(val, context)
             resolved[key] = result if result is not None else ""
         return resolved
 
-    def render(self, context: Dict[str, Any], **kwargs) -> Optional[str]:
+    def render(self, context, **kwargs) -> Optional[str]:
         if not self._check_when(context, **kwargs):
             return None
 
@@ -32,6 +34,6 @@ def render(self, context: Dict[str, Any], **kwargs) -> Optional[str]:
             raise ValueError("Missing 'i18n' in render kwargs")
 
         params = self._resolve_mapping(context)
-        locale = self.resolve_value(self.locale, context) if self.locale else None
+        locale = resolve_value(self.locale, context) if self.locale else None
 
         return i18n.get(self.text, locale, **params)

tests/test_format.py

@@ -1,23 +1,15 @@
 import pytest
-from textcompose.content.format import Format
 
+from textcompose.elements.format import Format
 
-def test_format_basic_render():
-    format_content = Format("Hello, {name}!")
-    result = format_content.render({"name": "Alice"})
-    assert result == "Hello, Alice!"
 
-
-def test_format_missing_key():
-    format_content = Format("Hello, {name}!")
-    with pytest.raises(KeyError):
-        format_content.render({})
-
-
-def test_format_with_condition():
-    format_content = Format("Conditional", when=lambda context: context.get("render", False))
-    result = format_content.render({"render": True})
-    assert result == "Conditional"
-
-    result = format_content.render({"render": False})
-    assert result is None
+@pytest.mark.parametrize(
+    "template,context,when,expected",
+    [
+        ("Hello {name}", {"name": "Alice"}, None, "Hello Alice"),
+        ("{x} + {y}", {"x": 1, "y": 2}, True, "1 + 2"),
+        ("{x}", {"x": "skip"}, False, None),
+    ],
+)
+def test_format(template, context, when, expected):
+    assert Format(template, when=when).render(context) == expected

tests/test_group.py

@@ -1,20 +1,16 @@
-from textcompose.container.group import Group
-from textcompose.content.text import Text
-
-
-def test_group_render_with_separator():
-    text1 = Text("One")
-    text2 = Text("Two")
-    group = Group(text1, text2, sep=", ")
-
-    result = group.render({})
-    assert result == "One, Two"
+import pytest
 
+from textcompose.container.group import Group
 
-def test_group_render_with_conditions():
-    text1 = Text("Visible", when=True)
-    text2 = Text("Hidden", when=False)
-    group = Group(text1, text2)
 
-    result = group.render({})
-    assert result == "Visible"
+@pytest.mark.parametrize(
+    "children,sep,when,context,expected",
+    [
+        (["a", "b", "c"], ",", None, {}, "a,b,c"),
+        (["x", None, "y"], "-", True, {}, "x-y"),
+        (["1", "2"], "|", False, {}, None),
+    ],
+)
+def test_group(children, sep, when, context, expected):
+    group = Group(*children, sep=sep, when=when)
+    assert group.render(context) == expected

tests/test_template.py

@@ -1,5 +1,5 @@
+from textcompose.elements.text import Text
 from textcompose.template import Template
-from textcompose.content.text import Text
 
 
 def test_template_render_multiple_components():