hyperclass 0.0.3__tar.gz → 0.0.5__tar.gz

{hyperclass-0.0.3 → hyperclass-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperclass
-Version: 0.0.3
+Version: 0.0.5
 Summary: Build interactive web applications as Python class hierarchies.
 Author: Grant Jenks
 License-Expression: Apache-2.0
@@ -50,7 +50,7 @@ from dataclasses import dataclass
 
 from hyperclass import (
     App, button, css, div, form, get, grid, hx, input, outer_morph,
-    post, rem,
+    name, post, rem,
 )
 
 
@@ -64,11 +64,17 @@ class card(div):
     )
 
 
+class guest_name(input):
+    name = name.name
+    placeholder = "Your name"
+    required = True
+
+
 class guest_form(form):
     style = css(display=grid, gap=.75 * rem)
 
     def content(self):
-        yield input(name="name", placeholder="Your name", required=True)
+        yield guest_name()
         yield button("Say hello", type="submit")
 
 
@@ -179,6 +185,39 @@ class greeting(card):
 Text and attribute values are escaped by default. `markup(...)` is the explicit
 escape hatch for trusted HTML.
 
+## HTML attributes inherit too
+
+Non-private class values become default HTML attributes:
+
+~~~python
+from hyperclass import a, input, name
+
+
+class external_link(a):
+    target = "_blank"
+    rel = "noreferrer"
+
+
+class url_field(input):
+    type = "url"
+    name = name.url
+    required = True
+    autocomplete = "url"
+~~~
+
+The defaults follow the same base-to-derived order as styles. Subclasses and
+multiple-inheritance mixins can override them. Attributes passed to an instance
+win last:
+
+~~~python
+external_link("Same tab", href="/", target="_self", rel=None)
+~~~
+
+`None` and `False` suppress an inherited attribute. Underscores in Python names
+become hyphens, so `aria_label` renders as `aria-label`. Boolean `True` renders
+as a valueless HTML attribute. An `hx = hx.get(...)` class default expands into
+the corresponding htmx attributes.
+
 ## CSS is Python too
 
 Base styles, pseudo-states, and media rules live on the component:
@@ -200,10 +239,11 @@ class primary_button(button):
     narrow = media(max_width=40 * rem, width="100%")
 ~~~
 
-Pages collect only the rules used by their element tree. Python inheritance and
-the CSS cascade cooperate instead of imitating one another.
+Pages collect only the rules used by their element tree. Rules use the concrete
+semantic class chain as their selector, so Python inheritance and the CSS
+cascade cooperate even when new component styles arrive later.
 
-## Classes and IDs are selectors
+## Classes, IDs, and names are selectors
 
 Classes can be used directly anywhere a selector is expected:
 
@@ -226,6 +266,19 @@ assert id.unread_count is id.unread_count
 As an HTML attribute, `id.unread_count` renders as `unread-count`. As a
 selector, it renders as `#unread-count`.
 
+Form names work the same way while preserving Python underscores:
+
+~~~python
+from hyperclass import name
+
+input(name=name.search_query)
+request.form[name.search_query]
+hx.get(search, include=name.search_query, target=id.results)
+~~~
+
+As an attribute, `name.search_query` renders as `search_query`. As a selector,
+it renders as `[name="search_query"]`. Repeated access returns the same object.
+
 ## Routes are references, not strings
 
 Application subclasses collect decorated method routes:
@@ -286,6 +339,7 @@ return a more specific `Response`.
 
 The underlying values remain available as `request.form`, `request.query`,
 `.get(...)`, `.getlist(...)`, and `.int(...)` when explicit parsing is clearer.
+Those accessors accept first-class `name.*` objects as well as strings.
 
 ## WSGI and htmx 4
 
@@ -305,6 +359,11 @@ htmx request sends only the fragment to swap.
 asset from jsDelivr. htmx 4 `<hx-partial>` responses can update several
 object-selected regions from one request.
 
+When an htmx response introduces a component that was not present on the first
+page, Hyperclass includes its CSS in a partial targeting the page's stable
+`hyperclass-styles` stylesheet. The new fragment is styled immediately, without
+a reload or a global CSS build.
+
 ## Try the examples
 
 Clone the repository and run the persistent SQLite bookmark inbox:

{hyperclass-0.0.3 → hyperclass-0.0.5}/README.md

@@ -20,7 +20,7 @@ from dataclasses import dataclass
 
 from hyperclass import (
     App, button, css, div, form, get, grid, hx, input, outer_morph,
-    post, rem,
+    name, post, rem,
 )
 
 
@@ -34,11 +34,17 @@ class card(div):
     )
 
 
+class guest_name(input):
+    name = name.name
+    placeholder = "Your name"
+    required = True
+
+
 class guest_form(form):
     style = css(display=grid, gap=.75 * rem)
 
     def content(self):
-        yield input(name="name", placeholder="Your name", required=True)
+        yield guest_name()
         yield button("Say hello", type="submit")
 
 
@@ -149,6 +155,39 @@ class greeting(card):
 Text and attribute values are escaped by default. `markup(...)` is the explicit
 escape hatch for trusted HTML.
 
+## HTML attributes inherit too
+
+Non-private class values become default HTML attributes:
+
+~~~python
+from hyperclass import a, input, name
+
+
+class external_link(a):
+    target = "_blank"
+    rel = "noreferrer"
+
+
+class url_field(input):
+    type = "url"
+    name = name.url
+    required = True
+    autocomplete = "url"
+~~~
+
+The defaults follow the same base-to-derived order as styles. Subclasses and
+multiple-inheritance mixins can override them. Attributes passed to an instance
+win last:
+
+~~~python
+external_link("Same tab", href="/", target="_self", rel=None)
+~~~
+
+`None` and `False` suppress an inherited attribute. Underscores in Python names
+become hyphens, so `aria_label` renders as `aria-label`. Boolean `True` renders
+as a valueless HTML attribute. An `hx = hx.get(...)` class default expands into
+the corresponding htmx attributes.
+
 ## CSS is Python too
 
 Base styles, pseudo-states, and media rules live on the component:
@@ -170,10 +209,11 @@ class primary_button(button):
     narrow = media(max_width=40 * rem, width="100%")
 ~~~
 
-Pages collect only the rules used by their element tree. Python inheritance and
-the CSS cascade cooperate instead of imitating one another.
+Pages collect only the rules used by their element tree. Rules use the concrete
+semantic class chain as their selector, so Python inheritance and the CSS
+cascade cooperate even when new component styles arrive later.
 
-## Classes and IDs are selectors
+## Classes, IDs, and names are selectors
 
 Classes can be used directly anywhere a selector is expected:
 
@@ -196,6 +236,19 @@ assert id.unread_count is id.unread_count
 As an HTML attribute, `id.unread_count` renders as `unread-count`. As a
 selector, it renders as `#unread-count`.
 
+Form names work the same way while preserving Python underscores:
+
+~~~python
+from hyperclass import name
+
+input(name=name.search_query)
+request.form[name.search_query]
+hx.get(search, include=name.search_query, target=id.results)
+~~~
+
+As an attribute, `name.search_query` renders as `search_query`. As a selector,
+it renders as `[name="search_query"]`. Repeated access returns the same object.
+
 ## Routes are references, not strings
 
 Application subclasses collect decorated method routes:
@@ -256,6 +309,7 @@ return a more specific `Response`.
 
 The underlying values remain available as `request.form`, `request.query`,
 `.get(...)`, `.getlist(...)`, and `.int(...)` when explicit parsing is clearer.
+Those accessors accept first-class `name.*` objects as well as strings.
 
 ## WSGI and htmx 4
 
@@ -275,6 +329,11 @@ htmx request sends only the fragment to swap.
 asset from jsDelivr. htmx 4 `<hx-partial>` responses can update several
 object-selected regions from one request.
 
+When an htmx response introduces a component that was not present on the first
+page, Hyperclass includes its CSS in a partial targeting the page's stable
+`hyperclass-styles` stylesheet. The new fragment is styled immediately, without
+a reload or a global CSS build.
+
 ## Try the examples
 
 Clone the repository and run the persistent SQLite bookmark inbox:

{hyperclass-0.0.3 → hyperclass-0.0.5}/hyperclass/__init__.py

@@ -62,7 +62,7 @@ from .wsgi import (
 )
 from .wsgi import delete as delete_route
 
-__version__ = "0.0.3"
+__version__ = "0.0.5"
 
 hidden = "hidden"
 submit = "submit"

{hyperclass-0.0.3 → hyperclass-0.0.5}/hyperclass/html.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from html import escape
 from typing import Any
 
-from .css import Media, PSEUDO_STATES, Style
+from .css import PSEUDO_STATES, Media, Style
 
 HTMX_SRC = "https://cdn.jsdelivr.net/npm/htmx.org@4.0.0"
 HTMX_INTEGRITY = (
@@ -51,6 +51,38 @@ class IdNamespace:
 id = IdNamespace()
 
 
+@dataclass(frozen=True)
+class Name:
+    """A first-class form name which is also usable as a selector."""
+
+    name: str
+
+    @property
+    def selector(self) -> str:
+        return f'[name="{self.name}"]'
+
+    def __str__(self) -> str:
+        return self.name
+
+
+class NameNamespace:
+    def __init__(self) -> None:
+        self._values: dict[str, Name] = {}
+
+    def __getattr__(self, value: str) -> Name:
+        if value.startswith("_"):
+            raise AttributeError(value)
+        try:
+            return self._values[value]
+        except KeyError:
+            field_name = Name(value)
+            self._values[value] = field_name
+            return field_name
+
+
+name = NameNamespace()
+
+
 class ElementMeta(type):
     @property
     def selector(cls) -> str:
@@ -93,12 +125,14 @@ def semantic_classes(value: type) -> tuple[type, ...]:
 def selector(value: Any) -> str:
     """Turn a selector string, element class, or element instance into CSS."""
 
-    if isinstance(value, Id):
+    if isinstance(value, (Id, Name)):
         return value.selector
     if isinstance(value, str):
         return value
     if isinstance(value, element):
-        identity = getattr(value, "_attrs", {}).get("id")
+        attributes = _class_attributes(type(value))
+        attributes.update(getattr(value, "_attrs", {}))
+        identity = attributes.get("id")
         if identity:
             return f"#{identity}"
         return selector(type(value))
@@ -139,33 +173,38 @@ def fragment(*children: Any) -> Fragment:
 
 class RenderContext:
     def __init__(self) -> None:
-        self.styled_classes: list[type] = []
-        self._seen_styles: set[type] = set()
+        self.styled_elements: list[type] = []
+        self._seen_elements: set[type] = set()
 
     def register(self, value: type) -> None:
-        if value in self._seen_styles:
+        if value in self._seen_elements:
             return
+        classes = semantic_classes(value)
         if any(
             isinstance(rule, (Style, Media))
-            for rule in value.__dict__.values()
+            for semantic_class in classes
+            for rule in semantic_class.__dict__.values()
         ):
-            self._seen_styles.add(value)
-            self.styled_classes.append(value)
+            self._seen_elements.add(value)
+            self.styled_elements.append(value)
 
     def stylesheet(self) -> str:
         rules: list[str] = []
-        for value in self.styled_classes:
-            base = f".{class_name(value)}"
-            for name, rule in value.__dict__.items():
-                if name == "style" and isinstance(rule, Style):
-                    rules.append(f"{base}{{{rule.render()}}}")
-                elif name in PSEUDO_STATES and isinstance(rule, Style):
-                    state = name.replace("_", "-")
-                    rules.append(f"{base}:{state}{{{rule.render()}}}")
-                elif isinstance(rule, Media):
-                    rules.append(
-                        f"@media {rule.query()}{{{base}{{{rule.style.render()}}}}}"
-                    )
+        for element_type in self.styled_elements:
+            classes = semantic_classes(element_type)
+            base = "".join(f".{class_name(value)}" for value in classes)
+            for value in classes:
+                for name, rule in value.__dict__.items():
+                    if name == "style" and isinstance(rule, Style):
+                        rules.append(f"{base}{{{rule.render()}}}")
+                    elif name in PSEUDO_STATES and isinstance(rule, Style):
+                        state = name.replace("_", "-")
+                        rules.append(f"{base}:{state}{{{rule.render()}}}")
+                    elif isinstance(rule, Media):
+                        rules.append(
+                            f"@media {rule.query()}"
+                            f"{{{base}{{{rule.style.render()}}}}}"
+                        )
         return "".join(rules)
 
 
@@ -183,6 +222,27 @@ def _attribute_value(value: Any) -> str:
     return str(value)
 
 
+def _attribute(target: dict[str, Any], name: str, value: Any) -> None:
+    if name == "hx" and isinstance(value, Mapping):
+        target.update(value)
+    else:
+        target[_attribute_name(name)] = value
+
+
+def _class_attributes(value: type) -> dict[str, Any]:
+    attributes: dict[str, Any] = {}
+    for semantic_class in semantic_classes(value):
+        for name, default in semantic_class.__dict__.items():
+            if name.startswith("_") or isinstance(default, (Style, Media, type)):
+                continue
+            if isinstance(default, (classmethod, staticmethod, property)):
+                continue
+            if callable(default):
+                continue
+            _attribute(attributes, name, default)
+    return attributes
+
+
 class element(metaclass=ElementMeta):
     """Base class for all rendered HTML elements."""
 
@@ -190,10 +250,7 @@ class element(metaclass=ElementMeta):
         self._children = children
         self._attrs: dict[str, Any] = {}
         for name, value in attributes.items():
-            if name == "hx" and isinstance(value, Mapping):
-                self._attrs.update(value)
-            else:
-                self._attrs[_attribute_name(name)] = value
+            _attribute(self._attrs, name, value)
 
     @property
     def selector(self) -> str:
@@ -256,7 +313,8 @@ partial = ElementMeta(
 
 
 def _render_attributes(node: element, classes: tuple[type, ...]) -> str:
-    attributes = dict(getattr(node, "_attrs", {}))
+    attributes = _class_attributes(type(node))
+    attributes.update(getattr(node, "_attrs", {}))
     generated = [class_name(value) for value in classes]
     explicit = attributes.pop("class", attributes.pop("class-", None))
     if explicit:
@@ -287,8 +345,7 @@ def _render(value: Any, context: RenderContext) -> str:
         value_type = type(value)
         tag = _tag_for(value_type)
         classes = semantic_classes(value_type)
-        for semantic_class in classes:
-            context.register(semantic_class)
+        context.register(value_type)
         attributes = _render_attributes(value, classes)
         if tag in VOID_TAGS:
             return f"<{tag}{attributes}>"
@@ -330,7 +387,9 @@ class Page:
         body_html = _render(self.children, context)
         head_html = _render(self.head, context)
         stylesheet = context.stylesheet()
-        style_html = f"<style>{stylesheet}</style>" if stylesheet else ""
+        style_html = (
+            f'<style id="{id.hyperclass_styles}">{stylesheet}</style>'
+        )
         script_html = ""
         if self.htmx:
             script_html = (
@@ -365,12 +424,15 @@ __all__ = [
     "Id",
     "IdNamespace",
     "Markup",
+    "Name",
+    "NameNamespace",
     "Page",
     "class_name",
     "element",
     "fragment",
     "id",
     "markup",
+    "name",
     "page",
     "partial",
     "render",

{hyperclass-0.0.3 → hyperclass-0.0.5}/hyperclass/htmx.py

@@ -66,7 +66,7 @@ class Htmx:
         for name, value in options.items():
             if value is None:
                 continue
-            if name in {"target", "select", "select_oob", "sync"}:
+            if name in {"include", "target", "select", "select_oob", "sync"}:
                 value = selector(value) if not isinstance(value, Target) else value
             values[_option_name(name)] = value
         return Attributes(values)

{hyperclass-0.0.3 → hyperclass-0.0.5}/hyperclass/wsgi.py

@@ -13,7 +13,16 @@ from typing import Any, Union, get_args, get_origin, get_type_hints
 from urllib.parse import parse_qs, quote, urlencode
 from wsgiref.simple_server import make_server
 
-from .html import Fragment, Page, element, render
+from .html import (
+    Fragment,
+    Page,
+    RenderContext,
+    element,
+    id,
+    markup,
+    partial,
+    render,
+)
 
 Handler = Callable[..., Any]
 StartResponse = Callable[[str, list[tuple[str, str]]], Any]
@@ -230,8 +239,8 @@ class Values(Mapping[str, str]):
     def __init__(self, values: Mapping[str, list[str]] | None = None):
         self._values = dict(values or {})
 
-    def __getitem__(self, key: str) -> str:
-        return self._values[key][-1]
+    def __getitem__(self, key: Any) -> str:
+        return self._values[str(key)][-1]
 
     def __iter__(self) -> Iterator[str]:
         return iter(self._values)
@@ -239,14 +248,14 @@ class Values(Mapping[str, str]):
     def __len__(self) -> int:
         return len(self._values)
 
-    def get(self, key: str, default: Any = None) -> Any:
-        values = self._values.get(key)
+    def get(self, key: Any, default: Any = None) -> Any:
+        values = self._values.get(str(key))
         return values[-1] if values else default
 
-    def getlist(self, key: str) -> list[str]:
-        return list(self._values.get(key, ()))
+    def getlist(self, key: Any) -> list[str]:
+        return list(self._values.get(str(key), ()))
 
-    def int(self, key: str, default: int | None = None) -> int:
+    def int(self, key: Any, default: int | None = None) -> int:
         value = self.get(key)
         if value is None:
             if default is not None:
@@ -479,11 +488,20 @@ class App:
         if isinstance(body, Page):
             text = body.render()
         elif isinstance(body, (element, Fragment)):
-            text = (
-                render(body)
-                if request.is_htmx
-                else Page(body, title=self.title).render()
-            )
+            if request.is_htmx:
+                context = RenderContext()
+                text = render(body, context=context)
+                stylesheet = context.stylesheet()
+                if stylesheet:
+                    text += render(
+                        partial(
+                            markup(stylesheet),
+                            id=id.hyperclass_styles,
+                            hx_swap="append",
+                        )
+                    )
+            else:
+                text = Page(body, title=self.title).render()
         else:
             text = str(body)
         payload = text.encode("utf-8")

{hyperclass-0.0.3 → hyperclass-0.0.5}/hyperclass.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperclass
-Version: 0.0.3
+Version: 0.0.5
 Summary: Build interactive web applications as Python class hierarchies.
 Author: Grant Jenks
 License-Expression: Apache-2.0
@@ -50,7 +50,7 @@ from dataclasses import dataclass
 
 from hyperclass import (
     App, button, css, div, form, get, grid, hx, input, outer_morph,
-    post, rem,
+    name, post, rem,
 )
 
 
@@ -64,11 +64,17 @@ class card(div):
     )
 
 
+class guest_name(input):
+    name = name.name
+    placeholder = "Your name"
+    required = True
+
+
 class guest_form(form):
     style = css(display=grid, gap=.75 * rem)
 
     def content(self):
-        yield input(name="name", placeholder="Your name", required=True)
+        yield guest_name()
         yield button("Say hello", type="submit")
 
 
@@ -179,6 +185,39 @@ class greeting(card):
 Text and attribute values are escaped by default. `markup(...)` is the explicit
 escape hatch for trusted HTML.
 
+## HTML attributes inherit too
+
+Non-private class values become default HTML attributes:
+
+~~~python
+from hyperclass import a, input, name
+
+
+class external_link(a):
+    target = "_blank"
+    rel = "noreferrer"
+
+
+class url_field(input):
+    type = "url"
+    name = name.url
+    required = True
+    autocomplete = "url"
+~~~
+
+The defaults follow the same base-to-derived order as styles. Subclasses and
+multiple-inheritance mixins can override them. Attributes passed to an instance
+win last:
+
+~~~python
+external_link("Same tab", href="/", target="_self", rel=None)
+~~~
+
+`None` and `False` suppress an inherited attribute. Underscores in Python names
+become hyphens, so `aria_label` renders as `aria-label`. Boolean `True` renders
+as a valueless HTML attribute. An `hx = hx.get(...)` class default expands into
+the corresponding htmx attributes.
+
 ## CSS is Python too
 
 Base styles, pseudo-states, and media rules live on the component:
@@ -200,10 +239,11 @@ class primary_button(button):
     narrow = media(max_width=40 * rem, width="100%")
 ~~~
 
-Pages collect only the rules used by their element tree. Python inheritance and
-the CSS cascade cooperate instead of imitating one another.
+Pages collect only the rules used by their element tree. Rules use the concrete
+semantic class chain as their selector, so Python inheritance and the CSS
+cascade cooperate even when new component styles arrive later.
 
-## Classes and IDs are selectors
+## Classes, IDs, and names are selectors
 
 Classes can be used directly anywhere a selector is expected:
 
@@ -226,6 +266,19 @@ assert id.unread_count is id.unread_count
 As an HTML attribute, `id.unread_count` renders as `unread-count`. As a
 selector, it renders as `#unread-count`.
 
+Form names work the same way while preserving Python underscores:
+
+~~~python
+from hyperclass import name
+
+input(name=name.search_query)
+request.form[name.search_query]
+hx.get(search, include=name.search_query, target=id.results)
+~~~
+
+As an attribute, `name.search_query` renders as `search_query`. As a selector,
+it renders as `[name="search_query"]`. Repeated access returns the same object.
+
 ## Routes are references, not strings
 
 Application subclasses collect decorated method routes:
@@ -286,6 +339,7 @@ return a more specific `Response`.
 
 The underlying values remain available as `request.form`, `request.query`,
 `.get(...)`, `.getlist(...)`, and `.int(...)` when explicit parsing is clearer.
+Those accessors accept first-class `name.*` objects as well as strings.
 
 ## WSGI and htmx 4
 
@@ -305,6 +359,11 @@ htmx request sends only the fragment to swap.
 asset from jsDelivr. htmx 4 `<hx-partial>` responses can update several
 object-selected regions from one request.
 
+When an htmx response introduces a component that was not present on the first
+page, Hyperclass includes its CSS in a partial targeting the page's stable
+`hyperclass-styles` stylesheet. The new fragment is styled immediately, without
+a reload or a global CSS build.
+
 ## Try the examples
 
 Clone the repository and run the persistent SQLite bookmark inbox:

{hyperclass-0.0.3 → hyperclass-0.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hyperclass"
-version = "0.0.3"
+version = "0.0.5"
 description = "Build interactive web applications as Python class hierarchies."
 readme = "README.md"
 requires-python = ">=3.10"

{hyperclass-0.0.3 → hyperclass-0.0.5}/tests/test_bookmarks.py

@@ -38,6 +38,8 @@ def test_bookmark_lifecycle(tmp_path):
     assert payload.startswith("<!doctype html>")
     assert "Bookmark inbox" in payload
     assert "0 unread bookmarks" in payload
+    assert '<style id="hyperclass-styles">' in payload
+    assert ".bookmark-card" not in payload
     assert 'content="width=device-width, initial-scale=1"' in payload
     assert (
         "@media (max-width:40rem){.bookmark-form{grid-template-columns:1fr}}"
@@ -55,7 +57,14 @@ def test_bookmark_lifecycle(tmp_path):
     assert "<!doctype html>" not in payload
     assert "Read this" in payload
     assert "1 unread bookmark" in payload
+    assert (
+        '<input class="text-field url-field" type="url" name="url" required'
+        in payload
+    )
+    assert 'target="_blank" rel="noreferrer"' in payload
     assert 'hx-patch="/bookmarks/1"' in payload
+    assert '<hx-partial id="hyperclass-styles" hx-swap="append">' in payload
+    assert ".bookmark-card.unread.unread-bookmark{display:grid" in payload
     bookmark = app.store.list()[0]
 
     captured, payload = request(

{hyperclass-0.0.3 → hyperclass-0.0.5}/tests/test_html.py

@@ -1,11 +1,15 @@
 from hyperclass import (
     Page,
+    a,
+    button,
     css,
     div,
     fragment,
     grid,
     id,
+    input,
     media,
+    name,
     orange,
     outer_morph,
     partial,
@@ -63,9 +67,14 @@ def test_page_collects_styles_and_pins_htmx_4():
     document = Page(warning_card("Careful"), title="Demo").render()
     assert document.startswith("<!doctype html>")
     assert "<title>Demo</title>" in document
-    assert ".card{display:grid;gap:1rem;padding:1.25rem}" in document
+    assert '<style id="hyperclass-styles">' in document
     assert (
-        ".warning-card{border-color:orange;background:rgb(255 165 0 / 0.08)}"
+        ".card.warning-card{display:grid;gap:1rem;padding:1.25rem}"
+        in document
+    )
+    assert (
+        ".card.warning-card{border-color:orange;"
+        "background:rgb(255 165 0 / 0.08)}"
         in document
     )
     assert "https://cdn.jsdelivr.net/npm/htmx.org@4.0.0" in document
@@ -99,11 +108,61 @@ def test_page_collects_state_and_media_styles_from_classes():
         narrow = media(max_width=40 * rem, grid_template_columns="1fr")
 
     document = Page(interactive_card()).render()
-    assert ".interactive-card:hover{background:lavender}" in document
+    assert ".card.interactive-card:hover{background:lavender}" in document
     assert (
-        ".interactive-card:focus-visible{outline:2px solid purple}" in document
+        ".card.interactive-card:focus-visible{outline:2px solid purple}"
+        in document
     )
     assert (
-        "@media (max-width:40rem){.interactive-card{grid-template-columns:1fr}}"
+        "@media (max-width:40rem){.card.interactive-card"
+        "{grid-template-columns:1fr}}"
         in document
     )
+
+
+def test_html_attributes_are_inherited_and_can_be_overridden():
+    class external_link(a):
+        target = "_blank"
+        rel = "noreferrer"
+
+    assert render(external_link("Python", href="https://python.org")) == (
+        '<a class="external-link" target="_blank" rel="noreferrer" '
+        'href="https://python.org">Python</a>'
+    )
+    assert render(external_link("Here", href="/", target="_self", rel=None)) == (
+        '<a class="external-link" target="_self" href="/">Here</a>'
+    )
+
+
+def test_multiple_inheritance_composes_attribute_defaults():
+    class disabled:
+        disabled = True
+        aria_disabled = "true"
+
+    class caution:
+        title = "Careful"
+
+    class cautious_button(button, disabled, caution):
+        title = "Really careful"
+
+    assert render(cautious_button("Continue")) == (
+        '<button class="disabled caution cautious-button" disabled '
+        'aria-disabled="true" title="Really careful">Continue</button>'
+    )
+
+
+def test_names_are_lazy_interned_attributes_and_selectors():
+    assert name.search_query is name.search_query
+    assert str(name.search_query) == "search_query"
+    assert name.search_query.selector == '[name="search_query"]'
+    assert selector(name.search_query) == '[name="search_query"]'
+    assert render(input(name=name.search_query)) == (
+        '<input name="search_query">'
+    )
+
+
+def test_class_default_id_controls_instance_selector():
+    class results(div):
+        id = id.search_results
+
+    assert results().selector == "#search-results"

{hyperclass-0.0.3 → hyperclass-0.0.5}/tests/test_htmx.py

@@ -1,4 +1,4 @@
-from hyperclass import closest, div, hx, outer_morph, render
+from hyperclass import closest, div, hx, id, name, outer_morph, render
 
 
 class counter(div):
@@ -24,3 +24,19 @@ def test_plain_class_target_becomes_a_selector():
     assert render(div(hx=hx.get("/counter", target=counter))) == (
         '<div hx-get="/counter" hx-target=".counter"></div>'
     )
+
+
+def test_class_attributes_can_declare_htmx_and_name_selectors():
+    class live_search(div):
+        hx = hx.get(
+            "/search",
+            include=name.query,
+            target=id.results,
+            swap=outer_morph,
+        )
+
+    assert render(live_search()) == (
+        '<div class="live-search" hx-get="/search" '
+        'hx-include="[name=&quot;query&quot;]" hx-target="#results" '
+        'hx-swap="outerMorph"></div>'
+    )

hyperclass-0.0.5/tests/test_package.py

@@ -0,0 +1,5 @@
+import hyperclass
+
+
+def test_version():
+    assert hyperclass.__version__ == "0.0.5"

{hyperclass-0.0.3 → hyperclass-0.0.5}/tests/test_wsgi.py

@@ -5,14 +5,17 @@ from wsgiref.util import setup_testing_defaults
 
 from hyperclass import (
     App,
+    Values,
     button,
     closest,
+    css,
     div,
     form,
     get,
     hidden,
     hx,
     input,
+    name,
     outer_morph,
     output,
     patch,
@@ -266,3 +269,30 @@ def test_dataclass_binding_uses_defaults_and_reports_bad_values():
     )
     assert captured["status"] == "400 Bad Request"
     assert payload == "invalid form value for priority: 'high'"
+
+
+def test_values_accept_first_class_form_names():
+    values = Values({"search_query": ["python", "wsgi"], "page": ["3"]})
+    assert values[name.search_query] == "wsgi"
+    assert values.get(name.search_query) == "wsgi"
+    assert values.getlist(name.search_query) == ["python", "wsgi"]
+    assert values.int(name.page) == 3
+
+
+def test_htmx_fragment_appends_required_styles_to_page_stylesheet():
+    class styled_result(div):
+        style = css(color="purple")
+
+    app = App()
+
+    @app.get("/result")
+    def result(request):
+        return styled_result("Found")
+
+    captured, payload = request(app, path="/result", htmx=True)
+    assert captured["status"] == "200 OK"
+    assert payload == (
+        '<div class="styled-result">Found</div>'
+        '<hx-partial id="hyperclass-styles" hx-swap="append">'
+        ".styled-result{color:purple}</hx-partial>"
+    )

hyperclass-0.0.3/tests/test_package.py

@@ -1,5 +0,0 @@
-import hyperclass
-
-
-def test_version():
-    assert hyperclass.__version__ == "0.0.3"