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:
@@ -8,7 +8,7 @@ from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from .jinja_bridge import sexp
|
||||
from .jinja_bridge import render
|
||||
from .page import SEARCH_HEADERS_MOBILE, SEARCH_HEADERS_DESKTOP
|
||||
|
||||
|
||||
@@ -31,43 +31,39 @@ def get_asset_url(ctx: dict) -> str:
|
||||
|
||||
def root_header_html(ctx: dict, *, oob: bool = False) -> str:
|
||||
"""Build the root header row HTML."""
|
||||
return sexp(
|
||||
'(~header-row :cart-mini-html cmi :blog-url bu :site-title st'
|
||||
' :nav-tree-html nth :auth-menu-html amh :nav-panel-html nph'
|
||||
' :oob oob)',
|
||||
cmi=ctx.get("cart_mini_html", ""),
|
||||
bu=call_url(ctx, "blog_url", ""),
|
||||
st=ctx.get("base_title", ""),
|
||||
nth=ctx.get("nav_tree_html", ""),
|
||||
amh=ctx.get("auth_menu_html", ""),
|
||||
nph=ctx.get("nav_panel_html", ""),
|
||||
return render(
|
||||
"header-row",
|
||||
cart_mini_html=ctx.get("cart_mini_html", ""),
|
||||
blog_url=call_url(ctx, "blog_url", ""),
|
||||
site_title=ctx.get("base_title", ""),
|
||||
nav_tree_html=ctx.get("nav_tree_html", ""),
|
||||
auth_menu_html=ctx.get("auth_menu_html", ""),
|
||||
nav_panel_html=ctx.get("nav_panel_html", ""),
|
||||
oob=oob,
|
||||
)
|
||||
|
||||
|
||||
def search_mobile_html(ctx: dict) -> str:
|
||||
"""Build mobile search input HTML."""
|
||||
return sexp(
|
||||
'(~search-mobile :current-local-href clh :search s :search-count sc'
|
||||
' :hx-select hs :search-headers-mobile shm)',
|
||||
clh=ctx.get("current_local_href", "/"),
|
||||
s=ctx.get("search", ""),
|
||||
sc=ctx.get("search_count", ""),
|
||||
hs=ctx.get("hx_select", "#main-panel"),
|
||||
shm=SEARCH_HEADERS_MOBILE,
|
||||
return render(
|
||||
"search-mobile",
|
||||
current_local_href=ctx.get("current_local_href", "/"),
|
||||
search=ctx.get("search", ""),
|
||||
search_count=ctx.get("search_count", ""),
|
||||
hx_select=ctx.get("hx_select", "#main-panel"),
|
||||
search_headers_mobile=SEARCH_HEADERS_MOBILE,
|
||||
)
|
||||
|
||||
|
||||
def search_desktop_html(ctx: dict) -> str:
|
||||
"""Build desktop search input HTML."""
|
||||
return sexp(
|
||||
'(~search-desktop :current-local-href clh :search s :search-count sc'
|
||||
' :hx-select hs :search-headers-desktop shd)',
|
||||
clh=ctx.get("current_local_href", "/"),
|
||||
s=ctx.get("search", ""),
|
||||
sc=ctx.get("search_count", ""),
|
||||
hs=ctx.get("hx_select", "#main-panel"),
|
||||
shd=SEARCH_HEADERS_DESKTOP,
|
||||
return render(
|
||||
"search-desktop",
|
||||
current_local_href=ctx.get("current_local_href", "/"),
|
||||
search=ctx.get("search", ""),
|
||||
search_count=ctx.get("search_count", ""),
|
||||
hx_select=ctx.get("hx_select", "#main-panel"),
|
||||
search_headers_desktop=SEARCH_HEADERS_DESKTOP,
|
||||
)
|
||||
|
||||
|
||||
@@ -76,19 +72,17 @@ def full_page(ctx: dict, *, header_rows_html: str,
|
||||
content_html: str = "", menu_html: str = "",
|
||||
body_end_html: str = "", meta_html: str = "") -> str:
|
||||
"""Render a full app page with the standard layout."""
|
||||
return sexp(
|
||||
'(~app-layout :title t :asset-url au :meta-html mh'
|
||||
' :header-rows-html hrh :menu-html muh :filter-html fh'
|
||||
' :aside-html ash :content-html ch :body-end-html beh)',
|
||||
t=ctx.get("base_title", "Rose Ash"),
|
||||
au=get_asset_url(ctx),
|
||||
mh=meta_html,
|
||||
hrh=header_rows_html,
|
||||
muh=menu_html,
|
||||
fh=filter_html,
|
||||
ash=aside_html,
|
||||
ch=content_html,
|
||||
beh=body_end_html,
|
||||
return render(
|
||||
"app-layout",
|
||||
title=ctx.get("base_title", "Rose Ash"),
|
||||
asset_url=get_asset_url(ctx),
|
||||
meta_html=meta_html,
|
||||
header_rows_html=header_rows_html,
|
||||
menu_html=menu_html,
|
||||
filter_html=filter_html,
|
||||
aside_html=aside_html,
|
||||
content_html=content_html,
|
||||
body_end_html=body_end_html,
|
||||
)
|
||||
|
||||
|
||||
@@ -96,12 +90,11 @@ def oob_page(ctx: dict, *, oobs_html: str = "",
|
||||
filter_html: str = "", aside_html: str = "",
|
||||
content_html: str = "", menu_html: str = "") -> str:
|
||||
"""Render an OOB response with standard swap targets."""
|
||||
return sexp(
|
||||
'(~oob-response :oobs-html oh :filter-html fh :aside-html ash'
|
||||
' :menu-html mh :content-html ch)',
|
||||
oh=oobs_html,
|
||||
fh=filter_html,
|
||||
ash=aside_html,
|
||||
mh=menu_html,
|
||||
ch=content_html,
|
||||
return render(
|
||||
"oob-response",
|
||||
oobs_html=oobs_html,
|
||||
filter_html=filter_html,
|
||||
aside_html=aside_html,
|
||||
menu_html=menu_html,
|
||||
content_html=content_html,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user