Externalize sexp to .sexpr files + render() API
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m20s
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m20s
Replace all 676 inline sexp() string calls across 7 services with render(component_name, **kwargs) calls backed by 46 external .sexpr component definition files (587 defcomps total). - Add render() function to shared/sexp/jinja_bridge.py - Add load_service_components() helper and update load_sexp_dir() for *.sexpr - Update parser keyword regex to support HTMX hx-on::event syntax - Convert remaining inline HTML in route files to render() calls - Add shared/sexp/templates/misc.sexp for cross-service utility components Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -66,7 +66,8 @@ def register():
|
||||
try:
|
||||
await svc_create_calendar(g.s, post_id, name)
|
||||
except Exception as e:
|
||||
return await make_response(f'<div class="text-red-600 text-sm">{e}</div>', 422)
|
||||
from shared.sexp.jinja_bridge import render as render_comp
|
||||
return await make_response(render_comp("error-inline", message=str(e)), 422)
|
||||
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_calendars_list_panel
|
||||
|
||||
@@ -37,7 +37,7 @@ def register():
|
||||
async def _container_nav_handler():
|
||||
from quart import current_app
|
||||
from shared.infrastructure.urls import events_url
|
||||
from shared.sexp.jinja_bridge import sexp as render_sexp
|
||||
from shared.sexp.jinja_bridge import render as render_comp
|
||||
|
||||
container_type = request.args.get("container_type", "page")
|
||||
container_id = int(request.args.get("container_id", 0))
|
||||
@@ -65,21 +65,21 @@ def register():
|
||||
date_str = entry.start_at.strftime("%b %d, %Y at %H:%M")
|
||||
if entry.end_at:
|
||||
date_str += f" – {entry.end_at.strftime('%H:%M')}"
|
||||
html_parts.append(render_sexp(
|
||||
'(~calendar-entry-nav :href href :name name :date-str date-str :nav-class nav-class)',
|
||||
html_parts.append(render_comp(
|
||||
"calendar-entry-nav",
|
||||
href=events_url(entry_path), name=entry.name,
|
||||
**{"date-str": date_str, "nav-class": nav_class},
|
||||
date_str=date_str, nav_class=nav_class,
|
||||
))
|
||||
# Infinite scroll sentinel (kept as raw HTML — HTMX-specific)
|
||||
if has_more and paginate_url_base:
|
||||
html_parts.append(
|
||||
f'<div id="entries-load-sentinel-{page}"'
|
||||
f' hx-get="{paginate_url_base}?page={page + 1}"'
|
||||
f' hx-trigger="intersect once"'
|
||||
f' hx-swap="beforebegin"'
|
||||
f' _="on htmx:afterRequest trigger scroll on #associated-entries-container"'
|
||||
f' class="flex-shrink-0 w-1"></div>'
|
||||
)
|
||||
html_parts.append(render_comp(
|
||||
"htmx-sentinel",
|
||||
id=f"entries-load-sentinel-{page}",
|
||||
hx_get=f"{paginate_url_base}?page={page + 1}",
|
||||
hx_trigger="intersect once",
|
||||
hx_swap="beforebegin",
|
||||
**{"class": "flex-shrink-0 w-1"},
|
||||
))
|
||||
|
||||
# Calendar links nav
|
||||
if not any(e.startswith("calendar") for e in excludes):
|
||||
@@ -88,9 +88,9 @@ def register():
|
||||
)
|
||||
for cal in calendars:
|
||||
href = events_url(f"/{post_slug}/{cal.slug}/")
|
||||
html_parts.append(render_sexp(
|
||||
'(~calendar-link-nav :href href :name name :nav-class nav-class)',
|
||||
href=href, name=cal.name, **{"nav-class": nav_class},
|
||||
html_parts.append(render_comp(
|
||||
"calendar-link-nav",
|
||||
href=href, name=cal.name, nav_class=nav_class,
|
||||
))
|
||||
|
||||
return "\n".join(html_parts)
|
||||
@@ -125,6 +125,7 @@ def register():
|
||||
async def _account_nav_item_handler():
|
||||
from quart import current_app
|
||||
from shared.infrastructure.urls import account_url
|
||||
from shared.sexp.jinja_bridge import render as render_comp
|
||||
|
||||
styles = current_app.jinja_env.globals.get("styles", {})
|
||||
nav_class = styles.get("nav_button", "")
|
||||
@@ -138,12 +139,10 @@ def register():
|
||||
# hx-* attributes that don't map neatly to a reusable component.
|
||||
parts = []
|
||||
for href, label in [(tickets_url, "tickets"), (bookings_url, "bookings")]:
|
||||
parts.append(
|
||||
f'<div class="relative nav-group">'
|
||||
f'<a href="{href}" hx-get="{href}" hx-target="#main-panel"'
|
||||
f' hx-select="{hx_select}" hx-swap="outerHTML"'
|
||||
f' hx-push-url="true" class="{nav_class}">{label}</a></div>'
|
||||
)
|
||||
parts.append(render_comp(
|
||||
"nav-group-link",
|
||||
href=href, hx_select=hx_select, nav_class=nav_class, label=label,
|
||||
))
|
||||
return "\n".join(parts)
|
||||
|
||||
_handlers["account-nav-item"] = _account_nav_item_handler
|
||||
@@ -176,7 +175,7 @@ def register():
|
||||
|
||||
async def _link_card_handler():
|
||||
from shared.infrastructure.urls import events_url
|
||||
from shared.sexp.jinja_bridge import sexp as render_sexp
|
||||
from shared.sexp.jinja_bridge import render as render_comp
|
||||
|
||||
slug = request.args.get("slug", "")
|
||||
keys_raw = request.args.get("keys", "")
|
||||
@@ -194,8 +193,8 @@ def register():
|
||||
g.s, "page", post.id,
|
||||
)
|
||||
cal_names = ", ".join(c.name for c in calendars) if calendars else ""
|
||||
parts.append(render_sexp(
|
||||
'(~link-card :title title :image image :subtitle subtitle :link link)',
|
||||
parts.append(render_comp(
|
||||
"link-card",
|
||||
title=post.title, image=post.feature_image,
|
||||
subtitle=cal_names, link=events_url(f"/{post.slug}"),
|
||||
))
|
||||
@@ -212,8 +211,8 @@ def register():
|
||||
g.s, "page", post.id,
|
||||
)
|
||||
cal_names = ", ".join(c.name for c in calendars) if calendars else ""
|
||||
return render_sexp(
|
||||
'(~link-card :title title :image image :subtitle subtitle :link link)',
|
||||
return render_comp(
|
||||
"link-card",
|
||||
title=post.title, image=post.feature_image,
|
||||
subtitle=cal_names, link=events_url(f"/{post.slug}"),
|
||||
)
|
||||
|
||||
@@ -50,7 +50,8 @@ def register():
|
||||
try:
|
||||
await svc_create_market(g.s, post_id, name)
|
||||
except Exception as e:
|
||||
return await make_response(f'<div class="text-red-600 text-sm">{e}</div>', 422)
|
||||
from shared.sexp.jinja_bridge import render as render_comp
|
||||
return await make_response(render_comp("error-inline", message=str(e)), 422)
|
||||
|
||||
from shared.sexp.page import get_template_context
|
||||
from sexp.sexp_components import render_markets_list_panel
|
||||
|
||||
Reference in New Issue
Block a user