tmk241/hemx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(slhx): prefer render methods for views

Browse Source 
Move view rendering onto Slot::render and KeyedSlot append/prepend/replace extension methods, leaving explicit text/html methods for non-view escape hatches.

req: codegen/002

req: view/001
This commit is contained in:
slhx agent
2026-05-26 01:31:58 +02:00
parent ba3f40a3f0
commit 5972785c3c
10 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/kanban/src/lib.rs
+1 -1
View File
@@ -27,7 +27,7 @@ mod tests {
#[test]
fn kanban_board_updates_generated_slot() {
fn render_board() -> impl IntoEffect {
ui::board::slots::board.render_view(&empty_board())
ui::board::slots::board.render(&empty_board())
}
let effect = inspect(render_board());
examples/kanban/src/main.rs
+3 -3
View File
@@ -131,13 +131,13 @@ async fn interact(
// req: push/001 req: push/003 req: examples/001
async fn events(Query(params): Query<BTreeMap<String, String>>) -> impl IntoResponse {
if params.contains_key("once") {
let effect = ui::board::slots::presence.render_view(&Presence { count: 1 });
let effect = ui::board::slots::presence.render(&Presence { count: 1 });
return sse(stream::iter([Ok::<_, Infallible>(effect.into_batch(ui::BUILD_FINGERPRINT))]).boxed());
}
let batches = stream::unfold(1_u64, |count| async move {
tokio::time::sleep(Duration::from_secs(4)).await;
let effect = ui::board::slots::presence.render_view(&Presence { count });
let effect = ui::board::slots::presence.render(&Presence { count });
Some((Ok::<_, Infallible>(effect.into_batch(ui::BUILD_FINGERPRINT)), count + 1))
})
.boxed();
@@ -199,7 +199,7 @@ fn registry(state: Arc<AppState>) -> HandlerRegistry {
fn board_effects(board: &BoardState, notice: &'static str) -> impl IntoEffect {
(
ui::board::slots::board.render_view(&board_view(board)),
ui::board::slots::board.render(&board_view(board)),
ui::board::slots::notice.text(notice),
ui::board::forms::create_card.clear("title"),
)
examples/techdemo/src/lib.rs
+1 -1
View File
@@ -28,7 +28,7 @@ mod tests {
fn techdemo_uses_generated_slots_for_multi_target_updates() {
fn update() -> impl IntoEffect {
(
ui::control_center::slots::hero_metrics.render_view(&FastMetric { label: "fast" }),
ui::control_center::slots::hero_metrics.render(&FastMetric { label: "fast" }),
ui::control_center::slots::notice.text("typed"),
)
}
examples/techdemo/src/main.rs
+8 -8
View File
@@ -263,13 +263,13 @@ async fn interact(
// req: push/001 req: push/003 req: examples/001
async fn events(Query(params): Query<BTreeMap<String, String>>) -> impl IntoResponse {
if params.contains_key("once") {
let effect = ui::control_center::slots::live_feed.render_view(&LiveFeed { tick: 1 });
let effect = ui::control_center::slots::live_feed.render(&LiveFeed { tick: 1 });
return sse(stream::iter([Ok::<_, Infallible>(effect.into_batch(ui::BUILD_FINGERPRINT))]).boxed());
}
let batches = stream::unfold(1_u64, |tick| async move {
tokio::time::sleep(Duration::from_secs(4)).await;
let effect = ui::control_center::slots::live_feed.render_view(&LiveFeed { tick });
let effect = ui::control_center::slots::live_feed.render(&LiveFeed { tick });
Some((Ok::<_, Infallible>(effect.into_batch(ui::BUILD_FINGERPRINT)), tick + 1))
})
.boxed();
@@ -378,10 +378,10 @@ fn registry(shared: Arc<Shared>) -> HandlerRegistry {
let mut demo = shared.demo.lock().unwrap();
demo.log("Simulated push event produced the same EffectBatch shape");
(
ui::control_center::slots::live_feed.render_view(&LiveFeed {
ui::control_center::slots::live_feed.render(&LiveFeed {
tick: demo.activity.len() as u64,
}),
ui::control_center::slots::activity.render_view(&activity_view(&demo)),
ui::control_center::slots::activity.render(&activity_view(&demo)),
ui::control_center::slots::notice.text("Push simulated · no client app code"),
)
}
@@ -407,10 +407,10 @@ fn update_work(demo: &mut DemoState, id: Option<&str>, update: impl FnOnce(&mut
fn demo_effects(demo: &DemoState, notice: &'static str) -> impl IntoEffect {
(
ui::control_center::slots::hero_metrics.render_view(&hero_view(demo)),
ui::control_center::slots::board.render_view(&board_view(demo)),
ui::control_center::slots::activity.render_view(&activity_view(demo)),
ui::control_center::slots::inspector.render_view(&inspector_view(demo)),
ui::control_center::slots::hero_metrics.render(&hero_view(demo)),
ui::control_center::slots::board.render(&board_view(demo)),
ui::control_center::slots::activity.render(&activity_view(demo)),
ui::control_center::slots::inspector.render(&inspector_view(demo)),
ui::control_center::slots::notice.text(notice),
ui::control_center::forms::launch_work.clear("title"),
)
examples/v0/src/lib.rs
+2 -2
View File
@@ -77,7 +77,7 @@ mod tests {
fn todos_append_keyed_rows_from_form_input() {
fn add_todo(input: TodoInput) -> impl IntoEffect {
let todo = Todo { id: 7, title: input.title };
ui::slots::todo_row.append_view(
ui::slots::todo_row.append(
todo.id.to_string(),
&TodoRow { title: todo.title },
)
@@ -121,7 +121,7 @@ mod tests {
fn page_swap_updates_content_and_history() {
fn load_docs() -> impl IntoEffect {
(
ui::slots::content.render_view(&DocsContent {
ui::slots::content.render(&DocsContent {
message: "This page was swapped.",
}),
ui::slots::title.text("Docs"),
examples/v0/src/main.rs
+2 -2
View File
@@ -136,7 +136,7 @@ fn registry(state: Arc<ExampleState>) -> HandlerRegistry {
todos.push(Todo { id, title: title.into() });
}
(
ui::todos::slots::todo_list.render_view(&todos_view(&todos)),
ui::todos::slots::todo_list.render(&todos_view(&todos)),
ui::todos::forms::new_todo.clear("title"),
)
}
@@ -163,7 +163,7 @@ fn registry(state: Arc<ExampleState>) -> HandlerRegistry {
.register_handle(ui::page_swap::handles::load_docs, |_| {
// req: page_swap/002, req: examples/001
(
ui::page_swap::slots::content.render_view(&DocsContent {
ui::page_swap::slots::content.render(&DocsContent {
message: "This content came from an EffectBatch.",
}),
ui::page_swap::slots::title.text("Docs"),
slhx-core/src/lib.rs
+3 -10
View File
@@ -777,13 +777,6 @@ impl<T> Slot<T> {
self.id
}
pub fn render(self, value: T) -> Effect
where
T: ToString,
{
self.text(value)
}
pub fn text(self, value: impl ToString) -> Effect {
Effect::Put {
target: ResourceRef::unscoped(self.id),
@@ -834,7 +827,7 @@ where
self.id
}
pub fn append(self, key: K, value: T) -> Effect
pub fn append_text(self, key: K, value: T) -> Effect
where
T: ToString,
{
@@ -845,7 +838,7 @@ where
}
}
pub fn prepend(self, key: K, value: T) -> Effect
pub fn prepend_text(self, key: K, value: T) -> Effect
where
T: ToString,
{
@@ -856,7 +849,7 @@ where
}
}
pub fn replace(self, key: K, value: T) -> Effect
pub fn replace_text(self, key: K, value: T) -> Effect
where
T: ToString,
{
slhx-core/tests/effect_batch.rs
+4 -4
View File
@@ -11,9 +11,9 @@ fn effect_batch_wire_round_trips() {
let user = Atom::<String>::new(3);
let batch = (
count.render(2),
todos.append(7, String::from("Buy milk")),
todos.replace(7, String::from("Buy oat milk")),
count.text(2),
todos.append_text(7, String::from("Buy milk")),
todos.replace_text(7, String::from("Buy oat milk")),
user.set("Ada"),
navigate("/todos"),
event("toast", "Saved"),
@@ -32,7 +32,7 @@ fn effect_batch_wire_round_trips() {
fn keyed_slot_replace_uses_scoped_resource_ref() {
let todos = KeyedSlot::<u64, String>::new(9);
// req: codegen/002
let effect = todos.replace(12, String::from("done"));
let effect = todos.replace_text(12, String::from("done"));
let Effect::Put { target, payload } = effect else {
panic!("expected Put");
slhx-test/tests/inspector.rs
+1 -1
View File
@@ -21,7 +21,7 @@ fn inspects_tuple_effects() {
#[test]
fn finds_keyed_slot_targets() {
let rows = KeyedSlot::<u32, String>::new(9);
let inspected = slhx_test::inspect(rows.append(7, String::from("row")));
let inspected = slhx_test::inspect(rows.append_text(7, String::from("row")));
assert!(inspected.has_keyed_slot(rows));
assert_eq!(inspected.ops().len(), 1);
slhx/src/lib.rs
+36 -8
View File
@@ -14,34 +14,62 @@ pub fn render_html(view: &impl hemplate::Hemplate) -> SafeHtml {
}
pub trait RenderSlotExt {
fn render_view(self, view: &impl hemplate::Hemplate) -> Effect;
fn render(self, view: &impl hemplate::Hemplate) -> Effect;
fn render_view(self, view: &impl hemplate::Hemplate) -> Effect
where
Self: Sized,
{
self.render(view)
}
}
impl<T> RenderSlotExt for Slot<T> {
fn render_view(self, view: &impl hemplate::Hemplate) -> Effect {
fn render(self, view: &impl hemplate::Hemplate) -> Effect {
self.html(render_html(view))
}
}
pub trait RenderKeyedSlotExt<K> {
fn append_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect;
fn prepend_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect;
fn replace_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect;
fn append(self, key: K, view: &impl hemplate::Hemplate) -> Effect;
fn prepend(self, key: K, view: &impl hemplate::Hemplate) -> Effect;
fn replace(self, key: K, view: &impl hemplate::Hemplate) -> Effect;
fn append_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect
where
Self: Sized,
{
self.append(key, view)
}
fn prepend_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect
where
Self: Sized,
{
self.prepend(key, view)
}
fn replace_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect
where
Self: Sized,
{
self.replace(key, view)
}
}
impl<K, T> RenderKeyedSlotExt<K> for KeyedSlot<K, T>
where
K: ToString,
{
fn append_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect {
fn append(self, key: K, view: &impl hemplate::Hemplate) -> Effect {
self.append_html(key, render_html(view))
}
fn prepend_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect {
fn prepend(self, key: K, view: &impl hemplate::Hemplate) -> Effect {
self.prepend_html(key, render_html(view))
}
fn replace_view(self, key: K, view: &impl hemplate::Hemplate) -> Effect {
fn replace(self, key: K, view: &impl hemplate::Hemplate) -> Effect {
self.replace_html(key, render_html(view))
}
}