hibiki_rails 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd126c85e743e5ec9c89e54a1ffaba4cb04e6b6b0ef89868d60023168a0936a7
-  data.tar.gz: 00b4dfa1606348df1039cf5b69d1129c170fd418966b3db120964b71eba1e1c6
+  metadata.gz: d708875aa67bf5d9b9137ac8d9bb05cf23604db936011706d068ec0b7116429c
+  data.tar.gz: 941b16f996127706d699e8812cf712b755c0f833f7a04c9e71912844421645ba
 SHA512:
-  metadata.gz: 3c1e7d75c946f79cc898c20c2c3a8457ba78c152963f8b8155dd70a26308c138b31acc4b7a732e037d6bc28e933fb542a509d2dabee2e03602727d7e5e81b6d6
-  data.tar.gz: 6edf4361a4edbda81b933167cb6a7e08030cb50aac694c601a22c2210036eab5c56b101a449d3ea174a5485347e7c9c6e1cc86f9da123cbfe02e0e1ed34f41dd
+  metadata.gz: 74175d980c70f1b4ea1bb9ba593ef9940326eccfce6c783ceefdebfb2a0659706faa1040393759549366c5880ea23459740e0f3f280e64fb47a4bc32a371f69c
+  data.tar.gz: c88a903f15b13516310beb32a7ed741942c49ae65823a6422fb36823400a9fea420ae08bd2fe047bc1d2e6ff3e38cef8f86c0665eeee6014e0f495c880ad90a4

data/CHANGELOG.md

@@ -4,6 +4,103 @@ The gem and the npm package are released in lockstep and share these version
 numbers — `app/assets/javascripts/hibiki.js` is a single copy served both ways,
 so importmap and bundler apps always resolve identical client code.
 
+## 0.6.0 — 2026-08-10
+
+### Added
+
+**`Hibiki::Rails.record_equals` — a per-signal comparator for ActiveRecord
+records.** `ActiveRecord#==` compares class and id only, so a stale record is
+`==` to its edited reload and a signal write carrying the fresh one is silently
+dropped. Pass the comparator per signal and the write goes through:
+
+```ruby
+state(:items, equals: Hibiki::Rails.record_equals) { fetch }
+```
+
+It compares class + `attributes`, recurses through arrays, and falls back to
+`==` for everything else. It needs hibiki 0.3.0's `equals:` (see the dependency
+change below), which is honored at both of the graph's equality gates — the
+write gate and the flush-time check — so a change that passes the comparator
+actually reaches the page. This is opt-in sugar that makes the snapshot pattern
+forgiving; "records stop at the boundary" stays the documented default, and a
+comparator still cannot see an in-place mutation that never enters the write
+path.
+
+**A development-mode warning for the write that pattern swallows.** When a
+`State` write is dropped by the default `==` but the old and new values'
+`attributes` differ — the classic silent-stale-UI debugging session — the log
+now says so and points at the docs. Development only (never test or
+production), zero semantic change: the write is still dropped.
+
+### Changed
+
+**The scaffold's row projection is gone — records now cross the boundary as
+frozen snapshots.** `app/models/book_row.rb` is no longer generated. The query
+object's `rows` returns real records, hardened at the boundary —
+
+```ruby
+def rows
+  @rows ||= window_scope.strict_loading.map { it.readonly!; it.freeze }
+end
+```
+
+— and the channels' `rows`/`row` deriveds compare them with
+`equals: Hibiki::Rails.record_equals`. What the `Data` projection's structural
+`==` used to provide, the comparator provides; what it could never provide, the
+freeze triple does: an attribute write raises `FrozenError`, `save` raises
+`ActiveRecord::ReadOnlyRecord`, and an unpreloaded association walk raises
+`ActiveRecord::StrictLoadingViolationError` instead of firing a lazy query off
+the graph thread. Views print a `belongs_to` label as `book.author&.name`
+directly, so **the scaffold no longer injects a `delegate` per `belongs_to`
+into the model** — the model injection is the `after_commit` ping alone. The
+member channel's fetch preloads its associations (`includes(...) +
+strict_loading`) for the same reason.
+
+Existing scaffolded apps keep working untouched: their `book_row.rb` and
+delegates are app code, and the runtime reads none of it. Re-running a scaffold
+with `--force` moves the resource over; the generator never deletes, so the
+orphaned `*_row.rb` stays on disk for you to remove.
+
+**The hibiki dependency floor is `~> 0.3`** (per-signal `equals:`, shipped in
+hibiki 0.3.0). Everything 0.2 provided still holds; generated channels now rely
+on the comparator being consulted at both equality gates.
+
+**The page control and the field-error line are shared partials now.** Each
+scaffold used to write its own copy per resource; both are presentation-only,
+so they are emitted once per app instead — `app/views/shared/_pagination.html.erb`
+and `_field_error.html.erb` (under `--phlex`: `Views::Shared::Pagination` and
+`Views::Shared::FieldError` in `app/views/shared/`). Everything resource-shaped
+reaches the page control as locals from the list partial. A second scaffold
+finds the files present and leaves them; if they were generated under a
+different `--css` style, a notice says so instead of silently restyling every
+other resource's control.
+
+**Pagination renders above the list as well as below**, so a long page starts
+with a control in reach. Both copies live inside the re-rendered fragment and
+carry distinct ids (`books_pagination_top` / `books_pagination`), so idiomorph
+updates them in place.
+
+Re-running a scaffold with `--force` moves the list over to the shared
+partials and prints a notice naming the now-dead per-resource copies — the
+generator never deletes them itself.
+
+**The form's error summary is a shared partial too** —
+`app/views/shared/_form_errors.html.erb` (under `--phlex`:
+`Views::Shared::FormErrors`), rendered by every scaffolded full-page form. The
+resource name comes off the record at render time, so one file serves every
+scaffold. Under `--css=tailwind` and `--css=daisyui` the block is styled as a
+red alert panel instead of the scaffold-stock `style="color: red"`, which
+`--css=none` keeps.
+
+### Fixed
+
+**The `hibiki_busy.css` import lands directly below `@import "tailwindcss";`**
+instead of at the end of the entry stylesheet — appending placed it after
+`@plugin` lines, and CSS requires every `@import` before any other statement.
+Also fixed: re-running a scaffold in a tailwindcss-rails app
+(`app/assets/tailwind/application.css`) duplicated the import on every run,
+because the idempotence probe checked the wrong path spelling.
+
 ## 0.5.1 — 2026-08-08
 
 ### Changed

data/lib/generators/hibiki/rails/css_variant.rb

@@ -87,10 +87,19 @@ module Hibiki
           spinner: "loading loading-spinner loading-xs",
           warning_text: "text-warning",
           error_text: "text-error text-sm mt-1",
+          # The full-form error summary. Plain Tailwind on purpose, so both
+          # styled variants share it via the merge — an addition (2026-08-09),
+          # not a transcription: the reference apps carried the scaffold-stock
+          # `style="color: red"` block, which --css=none still emits.
+          error_summary: "rounded-md border border-red-200 bg-red-50 p-4 mb-6",
+          error_summary_title: "text-sm font-semibold text-red-800",
+          error_summary_list: "mt-2 list-disc list-inside text-sm text-red-700",
           muted: "opacity-60 italic",
           muted_inline: "opacity-60",
           counts: "ml-auto text-sm opacity-70",
-          pagination_nav: "join mt-2 mx-auto flex justify-center w-fit"
+          # my-, not mt-: the control renders above the list as well as below,
+          # and the top copy needs the gap on its other side.
+          pagination_nav: "join my-2 mx-auto flex justify-center w-fit"
         }.freeze
 
         # DaisyUI is a plugin over Tailwind, and the merge says so literally:
@@ -135,7 +144,7 @@ module Hibiki
           muted: "text-gray-500 italic",
           muted_inline: "text-gray-400",
           counts: "ml-auto text-sm text-gray-500",
-          pagination_nav: "mt-2 mx-auto flex justify-center w-fit -space-x-px rounded-md shadow-sm"
+          pagination_nav: "my-2 mx-auto flex justify-center w-fit -space-x-px rounded-md shadow-sm"
         ).freeze
 
         # Every lookup misses, so every class argument is omitted entirely.

data/lib/generators/hibiki/rails/scaffold/USAGE

@@ -19,7 +19,6 @@ Example:
         db/migrate/XXXXXXXXXXXX_create_books.rb
         app/models/book.rb
         app/models/book_query.rb
-        app/models/book_row.rb
         app/channels/books_channel.rb
         app/channels/book_channel.rb
         app/forms/book_form.rb

data/lib/generators/hibiki/rails/scaffold_controller/USAGE

@@ -9,17 +9,15 @@ Description:
     reactive, edits happen in place, and changes from anywhere update every open
     list.
 
-    Two models are MODIFIED. This one gets a delegate for each belongs_to and
-    an after_commit broadcast. The related models get the missing has_many
-    association and a ping so changes are reflected here. Existing declarations
-    are left alone.
+    Two models are MODIFIED. This one gets an after_commit broadcast. The
+    related models get the missing has_many association and a ping so changes
+    are reflected here. Existing declarations are left alone.
 
 Example:
     bin/rails generate hibiki:rails:scaffold_controller Book
 
     This will create:
         app/models/book_query.rb
-        app/models/book_row.rb
         app/channels/books_channel.rb
         app/channels/book_channel.rb
         app/forms/book_form.rb

data/lib/generators/hibiki/rails/scaffold_controller/scaffold_controller_generator.rb

@@ -10,6 +10,7 @@ require_relative "../scaffold_parent_injection"
 require_relative "../scaffold_parent_notices"
 require_relative "../scaffold_phlex_helpers"
 require_relative "../scaffold_post_install"
+require_relative "../scaffold_shared_views"
 require_relative "../scaffold_transport_stylesheet"
 require_relative "../scaffold_schema"
 require_relative "../css_variant"
@@ -36,6 +37,7 @@ module Hibiki
         include ScaffoldParentInjection
         include ScaffoldParentNotices
         include ScaffoldPostInstall
+        include ScaffoldSharedViews
         include ScaffoldTransportStylesheet
 
         TEMPLATE_ROOT = File.expand_path("templates", __dir__)
@@ -100,7 +102,6 @@ module Hibiki
 
         def create_models
           template "query.rb.tt", query_path
-          template "row.rb.tt", row_path
         end
 
         def create_form
@@ -112,27 +113,26 @@ module Hibiki
         end
 
         def create_views
-          return create_phlex_views if phlex?
-
-          %w[index show new edit _form _list _controls _field_error].each do |view|
-            template "views/#{view}.html.erb.tt", view_path("#{view}.html.erb")
+          if phlex?
+            create_phlex_views
+          else
+            %w[index show new edit _form _list _controls].each do |view|
+              template "views/#{view}.html.erb.tt", view_path("#{view}.html.erb")
+            end
+
+            template "views/_row.html.erb.tt", view_path("_#{row_partial}.html.erb")
+            template "views/_row_form.html.erb.tt", view_path("_#{row_form_partial}.html.erb")
           end
 
-          template "views/_row.html.erb.tt", view_path("_#{row_partial}.html.erb")
-          template "views/_row_form.html.erb.tt", view_path("_#{row_form_partial}.html.erb")
-
-          # Under --infinite-scroll the sentinel is inlined in _list and there
-          # is no page control at all — not an empty one.
-          template "views/_pagination.html.erb.tt", view_path("_pagination.html.erb") unless infinite?
+          # The page control and the field-error line, once per app — see
+          # ScaffoldSharedViews.
+          create_shared_views
         end
 
         # The model being scaffolded — one of two files this generator modifies
-        # that the app already owned.
-        #
-        # It is not optional, and not only about the ping: the row partial
-        # prints an association's LABEL, and the show page hands that partial a
-        # live record — so without the delegate the show page raises on arrival.
-        # Once we are editing the model anyway, the ping belongs here too.
+        # that the app already owned. It gets the after_commit ping, which is
+        # what makes another tab, another user, the plain controller and a
+        # console write all reach an open list.
         #
         # The alternative — printing it and hoping — fails SILENTLY: everything
         # works in one tab, and cross-tab plus out-of-band writes simply never
@@ -181,11 +181,9 @@ module Hibiki
         #
         # Private, because a public method on a Thor generator is a command.
         def create_phlex_views
-          %w[index show new edit form list row row_form controls field_error].each do |view|
+          %w[index show new edit form list row row_form controls].each do |view|
             template "views/#{view}.rb.tt", view_path("#{view}.rb")
           end
-
-          template "views/pagination.rb.tt", view_path("pagination.rb") unless infinite?
         end
 
         # Ordered so an app's own lib/templates/... override wins first, then

data/lib/generators/hibiki/rails/scaffold_controller/templates/daisyui/views/_pagination.html.erb.tt

@@ -1,16 +1,22 @@
 <%#- The ONE component with a per-variant template. DaisyUI expresses a page
      item as two tokens (`join-item btn`), so each of the six variants below can
-     repeat them inline — which is exactly what plain Tailwind cannot do. -%>
-<%%# locals: (page: 1, page_count: 1) -%>
-<%%# The numbered page control, inside the replaced fragment so it re-renders
-    with the list. The links are anchors to the list, so a click also does the
-    browser's own fragment jump; data-turbo="false" keeps Turbo Drive out.
-    `on` returns a { data: } hash — merge, don't splat, or the anchor stops
-    scrolling. %>
+     repeat them inline — which is exactly what plain Tailwind cannot do.
+
+     Emitted ONCE per app into app/views/shared/, so nothing here may name the
+     resource: everything resource-shaped (the wrapper id, the anchor target,
+     the page-number window) arrives as a local from the list partial. The
+     `--css=` marker below is how a later scaffold run detects a variant
+     mismatch — keep it. -%>
+<%%# locals: (page: 1, page_count: 1, pages: [], anchor:, id:) -%>
+<%%# Shared page control (--css=<%= css_variant %>), rendered above and below
+    every scaffolded list. The links are anchors to the list, so a click also
+    does the browser's own fragment jump; data-turbo="false" keeps Turbo Drive
+    out. `on` returns a { data: } hash — merge, don't splat, or the anchor
+    stops scrolling. %>
 <%% page_data = ->(n) { { turbo: false }.merge(on(:go_to_page, with: { page: n })[:data]) } %>
 <%%# The wrapper always renders (so idiomorph has a node to pair with) and
     stays bare — layout classes here would leave dead space when empty. %>
-<div id="<%= pagination_dom_id %>">
+<div id="<%%= id %>">
   <%% if page_count > 1 %>
     <nav<%= css_attr(:pagination_nav) %> aria-label="Pagination">
       <%%# Prev/next go inert at the ends rather than disappearing, so the
@@ -18,17 +24,17 @@
       <%% if page == 1 %>
         <span class="join-item btn btn-disabled" aria-disabled="true">«</span>
       <%% else %>
-        <%%= link_to "«", "#<%= list_dom_id %>", class: "join-item btn", rel: "prev",
+        <%%= link_to "«", anchor, class: "join-item btn", rel: "prev",
                     "aria-label": "Previous page", data: page_data.(page - 1) %>
       <%% end %>
 
-      <%% <%= query_class_name %>.page_numbers(page: page, page_count: page_count).each do |n| %>
+      <%% pages.each do |n| %>
         <%% if n.nil? %>
           <span class="join-item btn btn-disabled" aria-hidden="true">…</span>
         <%% elsif n == page %>
           <span class="join-item btn btn-active" aria-current="page"><%%= n %></span>
         <%% else %>
-          <%%= link_to n, "#<%= list_dom_id %>", class: "join-item btn",
+          <%%= link_to n, anchor, class: "join-item btn",
                       "aria-label": "Page #{n}", data: page_data.(n) %>
         <%% end %>
       <%% end %>
@@ -36,7 +42,7 @@
       <%% if page == page_count %>
         <span class="join-item btn btn-disabled" aria-disabled="true">»</span>
       <%% else %>
-        <%%= link_to "»", "#<%= list_dom_id %>", class: "join-item btn", rel: "next",
+        <%%= link_to "»", anchor, class: "join-item btn", rel: "next",
                     "aria-label": "Next page", data: page_data.(page + 1) %>
       <%% end %>
     </nav>

data/lib/generators/hibiki/rails/scaffold_controller/templates/none/views/_pagination.html.erb.tt

@@ -3,16 +3,22 @@
      no stylesheet there is nothing to carry that signal, so the current page
      has to change ELEMENT — <strong> rather than a styled <span> — and the
      inert prev/next markers become plain text. A class-token map cannot
-     express a change of tag name. -%>
-<%%# locals: (page: 1, page_count: 1) -%>
-<%%# The numbered page control, inside the replaced fragment so it re-renders
-    with the list. The links are anchors to the list, so a click also does the
-    browser's own fragment jump; data-turbo="false" keeps Turbo Drive out.
-    `on` returns a { data: } hash — merge, don't splat, or the anchor stops
-    scrolling. %>
+     express a change of tag name.
+
+     Emitted ONCE per app into app/views/shared/, so nothing here may name the
+     resource: everything resource-shaped (the wrapper id, the anchor target,
+     the page-number window) arrives as a local from the list partial. The
+     `--css=` marker below is how a later scaffold run detects a variant
+     mismatch — keep it. -%>
+<%%# locals: (page: 1, page_count: 1, pages: [], anchor:, id:) -%>
+<%%# Shared page control (--css=<%= css_variant %>), rendered above and below
+    every scaffolded list. The links are anchors to the list, so a click also
+    does the browser's own fragment jump; data-turbo="false" keeps Turbo Drive
+    out. `on` returns a { data: } hash — merge, don't splat, or the anchor
+    stops scrolling. %>
 <%% page_data = ->(n) { { turbo: false }.merge(on(:go_to_page, with: { page: n })[:data]) } %>
 <%%# The wrapper always renders, so idiomorph always has a node to pair with. %>
-<div id="<%= pagination_dom_id %>">
+<div id="<%%= id %>">
   <%% if page_count > 1 %>
     <nav aria-label="Pagination">
       <%%# Prev/next go inert at the ends rather than disappearing, so the
@@ -20,24 +26,24 @@
       <%% if page == 1 %>
         <span aria-disabled="true">«</span>
       <%% else %>
-        <%%= link_to "«", "#<%= list_dom_id %>", rel: "prev",
+        <%%= link_to "«", anchor, rel: "prev",
                     "aria-label": "Previous page", data: page_data.(page - 1) %>
       <%% end %>
 
-      <%% <%= query_class_name %>.page_numbers(page: page, page_count: page_count).each do |n| %>
+      <%% pages.each do |n| %>
         <%% if n.nil? %>
           <span aria-hidden="true">…</span>
         <%% elsif n == page %>
           <strong aria-current="page"><%%= n %></strong>
         <%% else %>
-          <%%= link_to n, "#<%= list_dom_id %>", "aria-label": "Page #{n}", data: page_data.(n) %>
+          <%%= link_to n, anchor, "aria-label": "Page #{n}", data: page_data.(n) %>
         <%% end %>
       <%% end %>
 
       <%% if page == page_count %>
         <span aria-disabled="true">»</span>
       <%% else %>
-        <%%= link_to "»", "#<%= list_dom_id %>", rel: "next",
+        <%%= link_to "»", anchor, rel: "next",
                     "aria-label": "Next page", data: page_data.(page + 1) %>
       <%% end %>
     </nav>

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/daisyui/views/pagination.rb.tt

@@ -1,18 +1,23 @@
-<%#- ESCAPING: none — plain Ruby out, every <% is generation time. -%>
+<%#- ESCAPING: none — plain Ruby out, every <% is generation time. Emitted ONCE
+     per app into app/views/shared/, so nothing here may name the resource:
+     everything resource-shaped arrives as a keyword from the list component.
+     The `--css=` marker in the class comment is how a later scaffold run
+     detects a variant mismatch — keep it. -%>
 # frozen_string_literal: true
 
-# The numbered page control, inside the replaced fragment so it re-renders
-# with the list. The links are anchors to the list, so a click also does the
-# browser's own fragment jump; data-turbo="false" keeps Turbo Drive out.
-class <%= view_class_name(:pagination) %> < Views::Base
+# Shared page control (--css=<%= css_variant %>), rendered above and below
+# every scaffolded list. The links are anchors to the list, so a click also
+# does the browser's own fragment jump; data-turbo="false" keeps Turbo Drive
+# out.
+class Views::Shared::Pagination < Views::Base
 <%= phlex_includes(:link_to, hibiki: true) %>
 
-<%= initializer_source([%w[page 1], %w[page_count 1]]) %>
+<%= initializer_source([%w[page 1], %w[page_count 1], %w[pages []], ["anchor"], ["id"]]) %>
 
   def view_template
     # The wrapper always renders (so idiomorph has a node to pair with) and
     # stays bare — layout classes here would leave dead space when empty.
-    div(id: "<%= pagination_dom_id %>") do
+    div(id: @id) do
       nav<%= arg_list(*css_args(:pagination_nav), %(aria_label: "Pagination")) %> { items } if @page_count > 1
     end
   end
@@ -25,7 +30,7 @@ class <%= view_class_name(:pagination) %> < Views::Base
     @page == 1 ? inert("«") : step("«", @page - 1, rel: "prev", label: "Previous page")
     whitespace
 
-    <%= query_class_name %>.page_numbers(page: @page, page_count: @page_count).each do |n|
+    @pages.each do |n|
       if n.nil?
         span(class: "join-item btn btn-disabled", aria_hidden: "true") { "…" }
       elsif n == @page
@@ -48,7 +53,7 @@ class <%= view_class_name(:pagination) %> < Views::Base
   # The STRING "false", not the boolean — Phlex omits false-valued attributes.
   # And merge, don't splat: the anchor needs its own data attribute too.
   def step(text, n, label:, rel: nil)
-    link_to text, "#<%= list_dom_id %>", class: "join-item btn", rel:, "aria-label": label,
+    link_to text, @anchor, class: "join-item btn", rel:, "aria-label": label,
             data: { turbo: "false" }.merge(on(:go_to_page, with: { page: n })[:data])
   end
 end

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/none/views/pagination.rb.tt

@@ -1,20 +1,25 @@
-<%#- ESCAPING: none — plain Ruby out, every <% is generation time. -%>
+<%#- ESCAPING: none — plain Ruby out, every <% is generation time. Emitted ONCE
+     per app into app/views/shared/, so nothing here may name the resource:
+     everything resource-shaped arrives as a keyword from the list component.
+     The `--css=` marker in the class comment is how a later scaffold run
+     detects a variant mismatch — keep it. -%>
 # frozen_string_literal: true
 
-# The numbered page control, inside the replaced fragment so it re-renders
-# with the list. The links are anchors to the list, so a click also does the
-# browser's own fragment jump; data-turbo="false" keeps Turbo Drive out.
+# Shared page control (--css=<%= css_variant %>), rendered above and below
+# every scaffolded list. The links are anchors to the list, so a click also
+# does the browser's own fragment jump; data-turbo="false" keeps Turbo Drive
+# out.
 #
 # Unstyled, so the current page changes ELEMENT (strong) — there is no class
 # to carry the signal.
-class <%= view_class_name(:pagination) %> < Views::Base
+class Views::Shared::Pagination < Views::Base
 <%= phlex_includes(:link_to, hibiki: true) %>
 
-<%= initializer_source([%w[page 1], %w[page_count 1]]) %>
+<%= initializer_source([%w[page 1], %w[page_count 1], %w[pages []], ["anchor"], ["id"]]) %>
 
   def view_template
     # The wrapper always renders, so idiomorph always has a node to pair with.
-    div(id: "<%= pagination_dom_id %>") do
+    div(id: @id) do
       nav(aria_label: "Pagination") { items } if @page_count > 1
     end
   end
@@ -27,7 +32,7 @@ class <%= view_class_name(:pagination) %> < Views::Base
     @page == 1 ? inert("«") : step("«", @page - 1, rel: "prev", label: "Previous page")
     whitespace
 
-    <%= query_class_name %>.page_numbers(page: @page, page_count: @page_count).each do |n|
+    @pages.each do |n|
       if n.nil?
         span(aria_hidden: "true") { "…" }
       elsif n == @page
@@ -50,7 +55,7 @@ class <%= view_class_name(:pagination) %> < Views::Base
   # The STRING "false", not the boolean — Phlex omits false-valued attributes.
   # And merge, don't splat: the anchor needs its own data attribute too.
   def step(text, n, label:, rel: nil)
-    link_to text, "#<%= list_dom_id %>", rel:, "aria-label": label,
+    link_to text, @anchor, rel:, "aria-label": label,
             data: { turbo: "false" }.merge(on(:go_to_page, with: { page: n })[:data])
   end
 end

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/shared/views/field_error.rb.tt

@@ -1,10 +1,15 @@
 <%#- ESCAPING: a Phlex component is plain Ruby, so there is no runtime ERB here
      and nothing to double-escape. Every <% in this tree is generation time,
-     which is the one genuine simplification the port buys. -%>
+     which is the one genuine simplification the port buys.
+
+     Emitted ONCE per app into app/views/shared/. The `--css=` marker in the
+     class comment is how a later scaffold run detects a variant mismatch —
+     keep it. -%>
 # frozen_string_literal: true
 
-# One field's live validation message, or nothing at all.
-class <%= view_class_name(:field_error) %> < Views::Base
+# Shared field-error line (--css=<%= css_variant %>): one field's live
+# validation message, or nothing at all.
+class Views::Shared::FieldError < Views::Base
 <%= initializer_source([%w[message nil]]) %>
 
   def view_template

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/shared/views/form.rb.tt

@@ -9,13 +9,13 @@
 # Each belongs_to collection arrives as a keyword, never an ivar.
 <% end -%>
 class <%= view_class_name(:form) %> < Views::Base
-<%= phlex_includes(:form_with, :pluralize) %>
+<%= phlex_includes(:form_with) %>
 
 <%= initializer_source([[singular_name, nil], *schema.belongs_tos.map { [it.association_name.to_s.pluralize, "[]"] }]) %>
 
   def view_template
     form_with<%= arg_list("model: @#{singular_name}", *css_args(:form)) %> do |form|
-      errors
+<%= render_call(:form_errors, ["record: @#{singular_name}"], indent: 6, shared: true) %>
       fields(form)
 
       div { form.submit<%= css? ? %( class: "#{css(:btn_primary)}") : "" %> }
@@ -24,18 +24,6 @@ class <%= view_class_name(:form) %> < Views::Base
 
   private
 
-  def errors
-    return if @<%= singular_name %>.errors.empty?
-
-    div(style: "color: red") do
-      h2 { "#{pluralize(@<%= singular_name %>.errors.count, 'error')} prohibited this <%= human_name.downcase %> from being saved:" }
-
-      ul do
-        @<%= singular_name %>.errors.each { |error| li { error.full_message } }
-      end
-    end
-  end
-
   def fields(form)
     div<%= arg_list(*css_args(:fieldset)) %> do
 <% schema.columns.each_with_index do |column, index| -%>

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/shared/views/form_errors.rb.tt

@@ -0,0 +1,29 @@
+<%#- ESCAPING: a Phlex component is plain Ruby, so there is no runtime ERB here
+     and nothing to double-escape.
+
+     Emitted ONCE per app into app/views/shared/. The `--css=` marker in the
+     class comment is how a later scaffold run detects a variant mismatch —
+     keep it. Under --css=none the body is the scaffold-stock red block; the
+     styled variants dress the same structure. -%>
+# frozen_string_literal: true
+
+# Shared error summary (--css=<%= css_variant %>): every message that stopped
+# the record from saving, or nothing at all. The resource name comes off the
+# record, so one component serves every scaffold.
+class Views::Shared::FormErrors < Views::Base
+<%= phlex_includes(:pluralize) %>
+
+<%= initializer_source([%w[record]]) %>
+
+  def view_template
+    return if @record.errors.empty?
+
+    div<%= css? ? arg_list(*css_args(:error_summary)) : %[(style: "color: red")] %> do
+      h2<%= arg_list(*css_args(:error_summary_title)) %> { "#{pluralize(@record.errors.count, 'error')} prohibited this #{@record.model_name.human.downcase} from being saved:" }
+
+      ul<%= arg_list(*css_args(:error_summary_list)) %> do
+        @record.errors.each { |error| li { error.full_message } }
+      end
+    end
+  end
+end

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/shared/views/list.rb.tt

@@ -15,6 +15,13 @@ class <%= view_class_name(:list) %> < Views::Base
 
   def view_template
     div<%= arg_list(%(id: "#{list_dom_id}"), *css_args(:list)) %> do
+<% unless infinite? -%>
+      # Both page-control copies live inside the replaced fragment on purpose,
+      # so they re-render with the list; their distinct ids keep idiomorph
+      # from rebuilding them.
+      pagination("<%= pagination_dom_id %>_top")
+
+<% end -%>
       @<%= controller_file_name %>.each do |<%= singular_name %>|
 <%= render_call(:row, row_render_args(singular_name), indent: 8) %>
       end
@@ -26,12 +33,19 @@ class <%= view_class_name(:list) %> < Views::Base
 <% if infinite? -%>
       load_more if @remaining.positive?
 <% else -%>
-      # Inside the replaced fragment on purpose, so it re-renders with the
-      # list. Stable child ids keep idiomorph from rebuilding it.
-<%= render_call(:pagination, ["page: @page", "page_count: @page_count"], indent: 6) %>
+      pagination("<%= pagination_dom_id %>")
 <% end -%>
     end
   end
+<% unless infinite? -%>
+
+  private
+
+  def pagination(id)
+    pages = <%= query_class_name %>.page_numbers(page: @page, page_count: @page_count)
+<%= render_call(:pagination, ["page: @page", "page_count: @page_count", "pages: pages", %(anchor: "##{list_dom_id}"), "id: id"], indent: 4, shared: true) %>
+  end
+<% end -%>
 <% if infinite? -%>
 
   private

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/shared/views/row.rb.tt

@@ -6,8 +6,8 @@
 
 # One row, in either of its two modes.
 #
-# `@<%= singular_name %>` is duck-typed: the row projection from the index,
-# the model from the show page. Rendered by the channel through
+# `@<%= singular_name %>` is a record either way: a frozen read-only snapshot
+# from the channel, live from the show page. Rendered by the channel through
 # ApplicationController.render, which has no controller context — everything
 # this component branches on is a keyword argument instead.
 class <%= view_class_name(:row) %> < Views::Base

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/shared/views/row_form.rb.tt

@@ -57,7 +57,7 @@ class <%= view_class_name(:row_form) %> < Views::Base
 <% else -%>
     <%= column.tag_field_helper %> <%= wrapped_list(row_field_args(column), indent: column.tag_field_helper.length + 5).lstrip %>
 <% end -%>
-<%= render_call(:field_error, [%(message: #{form_ref}.error_for(:#{column.name}))], indent: 4) %>
+<%= render_call(:field_error, [%(message: #{form_ref}.error_for(:#{column.name}))], indent: 4, shared: true) %>
 <% end -%>
   end