Send all responses as sexp wire format with client-side rendering
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 5m35s
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 5m35s
- Server sends sexp source text, client (sexp.js) renders everything - SexpExpr marker class for nested sexp composition in serialize() - sexp_page() HTML shell with data-mount="body" for full page loads - sexp_response() returns text/sexp for OOB/partial responses - ~app-body layout component replaces ~app-layout (no raw!) - ~rich-text is the only component using raw! (for CMS HTML content) - Fragment endpoints return text/sexp, auto-wrapped in SexpExpr - All _*_html() helpers converted to _*_sexp() returning sexp source - Head auto-hoist: sexp.js moves meta/title/link/script[ld+json] from rendered body to document.head automatically - Unknown components render warning box instead of crashing page - Component kwargs preserve AST for lazy rendering (fixes <> in kwargs) - Fix unterminated paren in events/sexp/tickets.sexpr Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -12,6 +12,7 @@ from __future__ import annotations
|
||||
from quart import Blueprint, g, request, render_template, make_response
|
||||
|
||||
from shared.browser.app.utils.htmx import is_htmx_request
|
||||
from shared.sexp.helpers import sexp_response
|
||||
from shared.infrastructure.data_client import fetch_data
|
||||
from shared.contracts.dtos import PostDTO, dto_from_dict
|
||||
from shared.services.registry import services
|
||||
@@ -60,11 +61,11 @@ def register() -> Blueprint:
|
||||
|
||||
tctx = await get_template_context()
|
||||
if is_htmx_request():
|
||||
html = await render_all_markets_oob(tctx, markets, has_more, page_info, page)
|
||||
sexp_src = await render_all_markets_oob(tctx, markets, has_more, page_info, page)
|
||||
return sexp_response(sexp_src)
|
||||
else:
|
||||
html = await render_all_markets_page(tctx, markets, has_more, page_info, page)
|
||||
|
||||
return await make_response(html, 200)
|
||||
return await make_response(html, 200)
|
||||
|
||||
@bp.get("/all-markets")
|
||||
async def markets_fragment():
|
||||
@@ -72,7 +73,7 @@ def register() -> Blueprint:
|
||||
markets, has_more, page_info = await _load_markets(page)
|
||||
|
||||
from sexp.sexp_components import render_all_markets_cards
|
||||
html = await render_all_markets_cards(markets, has_more, page_info, page)
|
||||
return await make_response(html, 200)
|
||||
sexp_src = await render_all_markets_cards(markets, has_more, page_info, page)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
return bp
|
||||
|
||||
@@ -23,6 +23,7 @@ from .services import (
|
||||
|
||||
from shared.browser.app.redis_cacher import cache_page
|
||||
from shared.browser.app.utils.htmx import is_htmx_request
|
||||
from shared.sexp.helpers import sexp_response
|
||||
|
||||
def register():
|
||||
browse_bp = Blueprint("browse", __name__)
|
||||
@@ -49,10 +50,10 @@ def register():
|
||||
ctx.update(p_data)
|
||||
if not is_htmx_request():
|
||||
html = await render_market_home_page(ctx)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_market_home_oob(ctx)
|
||||
|
||||
return await make_response(html)
|
||||
sexp_src = await render_market_home_oob(ctx)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
@browse_bp.get("/all/")
|
||||
@cache_page(tag="browse")
|
||||
@@ -80,13 +81,15 @@ def register():
|
||||
tctx.update(full_context)
|
||||
if not is_htmx_request():
|
||||
html = await render_browse_page(tctx)
|
||||
resp = await make_response(html)
|
||||
elif product_info["page"] > 1:
|
||||
tctx.update(product_info)
|
||||
html = await render_browse_cards(tctx)
|
||||
sexp_src = await render_browse_cards(tctx)
|
||||
resp = sexp_response(sexp_src)
|
||||
else:
|
||||
html = await render_browse_oob(tctx)
|
||||
sexp_src = await render_browse_oob(tctx)
|
||||
resp = sexp_response(sexp_src)
|
||||
|
||||
resp = await make_response(html)
|
||||
resp.headers["Hx-Push-Url"] = _current_url_without_page()
|
||||
return _vary(resp)
|
||||
|
||||
@@ -119,13 +122,15 @@ def register():
|
||||
tctx.update(full_context)
|
||||
if not is_htmx_request():
|
||||
html = await render_browse_page(tctx)
|
||||
resp = await make_response(html)
|
||||
elif product_info["page"] > 1:
|
||||
tctx.update(product_info)
|
||||
html = await render_browse_cards(tctx)
|
||||
sexp_src = await render_browse_cards(tctx)
|
||||
resp = sexp_response(sexp_src)
|
||||
else:
|
||||
html = await render_browse_oob(tctx)
|
||||
sexp_src = await render_browse_oob(tctx)
|
||||
resp = sexp_response(sexp_src)
|
||||
|
||||
resp = await make_response(html)
|
||||
resp.headers["Hx-Push-Url"] = _current_url_without_page()
|
||||
return _vary(resp)
|
||||
|
||||
@@ -158,16 +163,18 @@ def register():
|
||||
tctx.update(full_context)
|
||||
if not is_htmx_request():
|
||||
html = await render_browse_page(tctx)
|
||||
resp = await make_response(html)
|
||||
elif product_info["page"] > 1:
|
||||
tctx.update(product_info)
|
||||
html = await render_browse_cards(tctx)
|
||||
sexp_src = await render_browse_cards(tctx)
|
||||
resp = sexp_response(sexp_src)
|
||||
else:
|
||||
html = await render_browse_oob(tctx)
|
||||
sexp_src = await render_browse_oob(tctx)
|
||||
resp = sexp_response(sexp_src)
|
||||
|
||||
resp = await make_response(html)
|
||||
resp.headers["Hx-Push-Url"] = _current_url_without_page()
|
||||
return _vary(resp)
|
||||
|
||||
|
||||
|
||||
|
||||
return browse_bp
|
||||
@@ -18,7 +18,10 @@ from ...market.filters.qs import decode
|
||||
|
||||
|
||||
def _hx_fragment_request() -> bool:
|
||||
return request.headers.get("HX-Request", "").lower() == "true"
|
||||
return (
|
||||
request.headers.get("SX-Request", "").lower() == "true"
|
||||
or request.headers.get("HX-Request", "").lower() == "true"
|
||||
)
|
||||
|
||||
async def _productInfo(top_slug=None, sub_slug=None):
|
||||
"""
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"""Market app fragment endpoints.
|
||||
|
||||
Exposes HTML fragments at ``/internal/fragments/<type>`` for consumption
|
||||
Exposes sexp fragments at ``/internal/fragments/<type>`` for consumption
|
||||
by other coop apps via the fragment client.
|
||||
"""
|
||||
|
||||
@@ -26,16 +26,16 @@ def register():
|
||||
async def get_fragment(fragment_type: str):
|
||||
handler = _handlers.get(fragment_type)
|
||||
if handler is None:
|
||||
return Response("", status=200, content_type="text/html")
|
||||
html = await handler()
|
||||
return Response(html, status=200, content_type="text/html")
|
||||
return Response("", status=200, content_type="text/sexp")
|
||||
src = await handler()
|
||||
return Response(src, status=200, content_type="text/sexp")
|
||||
|
||||
# --- container-nav fragment: market links --------------------------------
|
||||
|
||||
async def _container_nav_handler():
|
||||
from quart import current_app
|
||||
from shared.infrastructure.urls import market_url
|
||||
from shared.sexp.jinja_bridge import render as render_comp
|
||||
from shared.sexp.helpers import sexp_call
|
||||
|
||||
container_type = request.args.get("container_type", "page")
|
||||
container_id = int(request.args.get("container_id", 0))
|
||||
@@ -51,21 +51,31 @@ def register():
|
||||
parts = []
|
||||
for m in markets:
|
||||
href = market_url(f"/{post_slug}/{m.slug}/")
|
||||
parts.append(render_comp(
|
||||
"market-link-nav",
|
||||
href=href, name=m.name, nav_class=nav_class,
|
||||
))
|
||||
return "\n".join(parts)
|
||||
parts.append(sexp_call("market-link-nav",
|
||||
href=href, name=m.name, nav_class=nav_class))
|
||||
return "(<> " + " ".join(parts) + ")"
|
||||
|
||||
_handlers["container-nav"] = _container_nav_handler
|
||||
|
||||
# --- link-card fragment: product preview card --------------------------------
|
||||
|
||||
def _product_link_card_sexp(product, link: str) -> str:
|
||||
from shared.sexp.helpers import sexp_call
|
||||
subtitle = product.brand or ""
|
||||
detail = ""
|
||||
if product.special_price:
|
||||
detail = f"{product.regular_price} → {product.special_price}"
|
||||
elif product.regular_price:
|
||||
detail = str(product.regular_price)
|
||||
return sexp_call("link-card",
|
||||
title=product.title, image=product.image,
|
||||
subtitle=subtitle, detail=detail,
|
||||
link=link)
|
||||
|
||||
async def _link_card_handler():
|
||||
from sqlalchemy import select
|
||||
from shared.models.market import Product
|
||||
from shared.infrastructure.urls import market_url
|
||||
from shared.sexp.jinja_bridge import render as render_comp
|
||||
|
||||
slug = request.args.get("slug", "")
|
||||
keys_raw = request.args.get("keys", "")
|
||||
@@ -80,18 +90,8 @@ def register():
|
||||
await g.s.execute(select(Product).where(Product.slug == s))
|
||||
).scalar_one_or_none()
|
||||
if product:
|
||||
subtitle = product.brand or ""
|
||||
detail = ""
|
||||
if product.special_price:
|
||||
detail = f"<s>{product.regular_price}</s> {product.special_price}"
|
||||
elif product.regular_price:
|
||||
detail = str(product.regular_price)
|
||||
parts.append(render_comp(
|
||||
"link-card",
|
||||
title=product.title, image=product.image,
|
||||
subtitle=subtitle, detail=detail,
|
||||
link=market_url(f"/product/{product.slug}/"),
|
||||
))
|
||||
parts.append(_product_link_card_sexp(
|
||||
product, market_url(f"/product/{product.slug}/")))
|
||||
return "\n".join(parts)
|
||||
|
||||
# Single mode
|
||||
@@ -102,18 +102,7 @@ def register():
|
||||
).scalar_one_or_none()
|
||||
if not product:
|
||||
return ""
|
||||
subtitle = product.brand or ""
|
||||
detail = ""
|
||||
if product.special_price:
|
||||
detail = f"<s>{product.regular_price}</s> {product.special_price}"
|
||||
elif product.regular_price:
|
||||
detail = str(product.regular_price)
|
||||
return render_comp(
|
||||
"link-card",
|
||||
title=product.title, image=product.image,
|
||||
subtitle=subtitle, detail=detail,
|
||||
link=market_url(f"/product/{product.slug}/"),
|
||||
)
|
||||
return _product_link_card_sexp(product, market_url(f"/product/{product.slug}/"))
|
||||
|
||||
_handlers["link-card"] = _link_card_handler
|
||||
|
||||
|
||||
@@ -23,8 +23,9 @@ def register():
|
||||
tctx = await get_template_context()
|
||||
if not is_htmx_request():
|
||||
html = await render_market_admin_page(tctx)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_market_admin_oob(tctx)
|
||||
|
||||
return await make_response(html)
|
||||
from shared.sexp.helpers import sexp_response
|
||||
sexp_src = await render_market_admin_oob(tctx)
|
||||
return sexp_response(sexp_src)
|
||||
return bp
|
||||
|
||||
@@ -18,8 +18,10 @@ def register():
|
||||
tctx = await get_template_context()
|
||||
if not is_htmx_request():
|
||||
html = await render_page_admin_page(tctx)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_page_admin_oob(tctx)
|
||||
return await make_response(html)
|
||||
from shared.sexp.helpers import sexp_response
|
||||
sexp_src = await render_page_admin_oob(tctx)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
return bp
|
||||
|
||||
@@ -12,6 +12,7 @@ from __future__ import annotations
|
||||
from quart import Blueprint, g, request, render_template, make_response
|
||||
|
||||
from shared.browser.app.utils.htmx import is_htmx_request
|
||||
from shared.sexp.helpers import sexp_response
|
||||
from shared.services.registry import services
|
||||
|
||||
|
||||
@@ -45,11 +46,11 @@ def register() -> Blueprint:
|
||||
tctx = await get_template_context()
|
||||
tctx["post"] = post
|
||||
if is_htmx_request():
|
||||
html = await render_page_markets_oob(tctx, markets, has_more, page)
|
||||
sexp_src = await render_page_markets_oob(tctx, markets, has_more, page)
|
||||
return sexp_response(sexp_src)
|
||||
else:
|
||||
html = await render_page_markets_page(tctx, markets, has_more, page)
|
||||
|
||||
return await make_response(html, 200)
|
||||
return await make_response(html, 200)
|
||||
|
||||
@bp.get("/page-markets")
|
||||
async def markets_fragment():
|
||||
@@ -60,7 +61,7 @@ def register() -> Blueprint:
|
||||
|
||||
from sexp.sexp_components import render_page_markets_cards
|
||||
post_slug = post.get("slug", "")
|
||||
html = await render_page_markets_cards(markets, has_more, page, post_slug)
|
||||
return await make_response(html, 200)
|
||||
sexp_src = await render_page_markets_cards(markets, has_more, page, post_slug)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
return bp
|
||||
|
||||
@@ -19,6 +19,7 @@ from shared.browser.app.redis_cacher import cache_page, clear_cache
|
||||
from ..cart.services import total
|
||||
from shared.infrastructure.actions import call_action
|
||||
from .services.product_operations import massage_full_product
|
||||
from shared.sexp.helpers import sexp_response
|
||||
|
||||
|
||||
def register():
|
||||
@@ -115,10 +116,10 @@ def register():
|
||||
tctx["liked_by_current_user"] = item_data.get("liked", False)
|
||||
if not is_htmx_request():
|
||||
html = await render_product_page(tctx, d)
|
||||
return html
|
||||
else:
|
||||
html = await render_product_oob(tctx, d)
|
||||
|
||||
return html
|
||||
sexp_src = await render_product_oob(tctx, d)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
@bp.post("/like/toggle/")
|
||||
@clear_cache(tag="browse", tag_scope="user")
|
||||
@@ -128,9 +129,7 @@ def register():
|
||||
from sexp.sexp_components import render_like_toggle_button
|
||||
|
||||
if not g.user:
|
||||
html = render_like_toggle_button(product_slug, False)
|
||||
resp = make_response(html, 403)
|
||||
return resp
|
||||
return sexp_response(render_like_toggle_button(product_slug, False), status=403)
|
||||
|
||||
user_id = g.user.id
|
||||
|
||||
@@ -139,7 +138,7 @@ def register():
|
||||
})
|
||||
liked = result["liked"]
|
||||
|
||||
return render_like_toggle_button(product_slug, liked)
|
||||
return sexp_response(render_like_toggle_button(product_slug, liked))
|
||||
|
||||
|
||||
|
||||
@@ -156,10 +155,10 @@ def register():
|
||||
tctx["liked_by_current_user"] = item_data.get("liked", False)
|
||||
if not is_htmx_request():
|
||||
html = await render_product_admin_page(tctx, d)
|
||||
return await make_response(html)
|
||||
else:
|
||||
html = await render_product_admin_oob(tctx, d)
|
||||
|
||||
return await make_response(html)
|
||||
sexp_src = await render_product_admin_oob(tctx, d)
|
||||
return sexp_response(sexp_src)
|
||||
|
||||
|
||||
from bp.cart.services.identity import current_cart_identity
|
||||
@@ -254,11 +253,11 @@ def register():
|
||||
)
|
||||
|
||||
# htmx response: OOB-swap mini cart + product buttons
|
||||
if request.headers.get("HX-Request") == "true":
|
||||
if request.headers.get("SX-Request") == "true" or request.headers.get("HX-Request") == "true":
|
||||
from sexp.sexp_components import render_cart_added_response
|
||||
item_data = getattr(g, "item_data", {})
|
||||
d = item_data.get("d", {})
|
||||
return render_cart_added_response(g.cart, ci_ns, d)
|
||||
return sexp_response(render_cart_added_response(g.cart, ci_ns, d))
|
||||
|
||||
# normal POST: go to cart page
|
||||
from shared.infrastructure.urls import cart_url
|
||||
|
||||
Reference in New Issue
Block a user