terrazzo 0.6.0 → 0.7.0

data/lib/generators/terrazzo/install/templates/application.js.erb

@@ -4,6 +4,9 @@ import { Application } from "@thoughtbot/superglue"
 import { buildVisitAndRemote } from "./application_visit"
 import { pageToPageMapping } from "./page_to_page_mapping"
 import { store } from "./store"
+import "../../views/<%= namespace_name %>/fields"
+import "../../views/<%= namespace_name %>/components"
+import "../../views/<%= namespace_name %>/components/ui"
 
 if (typeof window !== "undefined") {
   document.addEventListener("DOMContentLoaded", function () {

data/lib/generators/terrazzo/install/templates/components.json.erb

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "default",
+  "rsc": false,
+  "tsx": false,
+  "tailwind": {
+    "config": "",
+    "css": "app/assets/stylesheets/<%= namespace_name %>.css",
+    "baseColor": "zinc",
+    "cssVariables": true
+  },
+  "aliases": {
+    "components": "app/views/<%= namespace_name %>/components",
+    "ui": "app/views/<%= namespace_name %>/components/ui",
+    "utils": "terrazzo"
+  }
+}

data/lib/generators/terrazzo/install/templates/custom_page_mapping.js.erb

@@ -0,0 +1,5 @@
+// Manual custom page mappings for pages you own.
+// Resource-specific Terrazzo view generators write to generated_page_mapping.js.
+
+export const customPageMapping = {
+}

data/lib/generators/terrazzo/install/templates/generated_page_mapping.js.erb

@@ -0,0 +1,10 @@
+// Resource-specific page mappings generated by Terrazzo.
+// Add manual custom pages to custom_page_mapping.js instead.
+
+// Terrazzo generated page imports start
+// Terrazzo generated page imports end
+
+export const generatedPageMapping = {
+  // Terrazzo generated page mappings start
+  // Terrazzo generated page mappings end
+}

data/lib/generators/terrazzo/install/templates/jsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./*"]
+    }
+  }
+}

data/lib/generators/terrazzo/install/templates/page_to_page_mapping.js.erb

@@ -2,14 +2,22 @@ import AdminIndex from "../../views/<%= namespace_name %>/application/index";
 import AdminShow from "../../views/<%= namespace_name %>/application/show";
 import AdminNew from "../../views/<%= namespace_name %>/application/new";
 import AdminEdit from "../../views/<%= namespace_name %>/application/edit";
+import { generatedPageMapping } from "./generated_page_mapping";
+import { customPageMapping } from "./custom_page_mapping";
 
-const pages = {
+const applicationPages = {
   '<%= namespace_name %>/application/index': AdminIndex,
   '<%= namespace_name %>/application/show': AdminShow,
   '<%= namespace_name %>/application/new': AdminNew,
   '<%= namespace_name %>/application/edit': AdminEdit,
 }
 
+const pages = {
+  ...applicationPages,
+  ...generatedPageMapping,
+  ...customPageMapping,
+}
+
 // Resolves resource-specific page identifiers (e.g. "admin/orders/index")
 // with fallback to the shared application component (e.g. "admin/application/index").
 export const pageToPageMapping = new Proxy(pages, {

data/lib/generators/terrazzo/install/templates/superglue.html.erb.erb

@@ -7,8 +7,8 @@
   <%%= csp_meta_tag %>
   <%%= yield :head %>
 <% if vite? -%>
-  <%%= vite_react_refresh_tag %>
-  <%%= vite_javascript_tag "<%= namespace_name %>/application" %>
+  <%%= vite_client_tag %>
+  <%%= vite_javascript_tag "<%= vite_entry_point_tag_name %>" %>
 <% else -%>
   <%%= javascript_include_tag "<%= namespace_name %>", type: "module" %>
 <% end -%>

data/lib/generators/terrazzo/routes/routes_generator.rb

@@ -11,36 +11,25 @@ module Terrazzo
       def insert_routes
         namespace_name = options[:namespace]
         models = application_models
+        raise_no_models_error if models.empty?
 
-        # Group models by their module namespace
-        namespaced = {}
-        top_level = []
+        route_tree = empty_route_tree
 
         models.each do |model|
           parts = model.name.split("::")
           if parts.size > 1
-            ns = parts[0..-2].join("::").underscore
+            namespaces = parts[0..-2].map(&:underscore)
             resource = parts.last.underscore.pluralize
-            namespaced[ns] ||= []
-            namespaced[ns] << resource
+            add_route_resource(route_tree, namespaces, resource)
           else
-            top_level << model.model_name.plural
+            add_route_resource(route_tree, [], model.model_name.plural)
           end
         end
 
-        lines = []
-        top_level.sort.each { |r| lines << "    resources :#{r}" }
+        lines = route_lines(route_tree, indent_level: 1)
+        first_resource = first_route_target(route_tree)
 
-        namespaced.sort.each do |ns, resources|
-          lines << ""
-          lines << "    namespace :#{ns} do"
-          resources.sort.each { |r| lines << "      resources :#{r}" }
-          lines << "    end"
-        end
-
-        first_resource = top_level.sort.first || namespaced.values.flatten.first || "dashboard"
-
-        route_block = <<~RUBY.indent(2)
+        route_block = <<~RUBY
           namespace :#{namespace_name} do
           #{lines.join("\n")}
 
@@ -55,7 +44,7 @@ module Terrazzo
           say ""
           lines.each { |line| say line }
           say ""
-          say "    root to: \"#{first_resource}#index\"", :green if first_resource
+          say "  root to: \"#{first_resource}#index\"", :green if first_resource
           say ""
           return
         end
@@ -78,6 +67,52 @@ module Terrazzo
         end.select { |klass| klass < ApplicationRecord && !klass.abstract_class? }
          .sort_by { |klass| klass.name }
       end
+
+      def empty_route_tree
+        { resources: [], namespaces: {} }
+      end
+
+      def add_route_resource(tree, namespaces, resource)
+        if namespaces.empty?
+          tree[:resources] << resource
+          return
+        end
+
+        namespace = namespaces.first
+        child_tree = tree[:namespaces][namespace] ||= empty_route_tree
+        add_route_resource(child_tree, namespaces.drop(1), resource)
+      end
+
+      def route_lines(tree, indent_level:)
+        indent = "  " * indent_level
+        lines = tree[:resources].uniq.sort.map { |resource| "#{indent}resources :#{resource}" }
+
+        tree[:namespaces].sort.each do |namespace, child_tree|
+          lines << "" if lines.any?
+          lines << "#{indent}namespace :#{namespace} do"
+          lines.concat(route_lines(child_tree, indent_level: indent_level + 1))
+          lines << "#{indent}end"
+        end
+
+        lines
+      end
+
+      def first_route_target(tree)
+        resource = tree[:resources].uniq.sort.first
+        return resource if resource
+
+        namespace, child_tree = tree[:namespaces].sort.first
+        child_target = first_route_target(child_tree) if child_tree
+        return "#{namespace}/#{child_target}" if namespace && child_target
+      end
+
+      def raise_no_models_error
+        raise Thor::Error, <<~MESSAGE
+          Terrazzo could not find any ApplicationRecord models to route.
+
+          Add at least one model first, then run `bin/rails generate terrazzo:routes` again.
+        MESSAGE
+      end
     end
   end
 end

data/lib/generators/terrazzo/views/edit_generator.rb

@@ -1,10 +1,12 @@
 require "rails/generators"
+require_relative "generated_defaults_helper"
 require_relative "page_mapping_helper"
 
 module Terrazzo
   module Generators
     module Views
       class EditGenerator < Rails::Generators::Base
+        include GeneratedDefaultsHelper
         include PageMappingHelper
 
         source_root File.expand_path("templates", __dir__)
@@ -14,17 +16,22 @@ module Terrazzo
 
         class_option :namespace, type: :string, default: "admin",
           desc: "Admin namespace"
+        class_option :with_counterpart, type: :boolean, default: nil,
+          desc: "Also eject the new view that shares this form partial"
 
         def copy_edit_template
+          ensure_page_barrels
+
           if resource.present?
             eject_json_props
-            copy_file "pages/edit.jsx", "app/views/#{namespace_name}/#{resource_path}/edit.jsx"
-            copy_file "pages/_form.jsx", "app/views/#{namespace_name}/#{resource_path}/_form.jsx"
+            copy_resource_page_file "pages/edit.jsx", "app/views/#{namespace_name}/#{resource_path}/edit.jsx"
+            copy_resource_page_file_unless_exists "pages/_form.jsx", "app/views/#{namespace_name}/#{resource_path}/_form.jsx"
             register_page_mapping("edit")
             eject_new_view if should_eject_new?
           else
-            copy_file "pages/edit.jsx", "app/views/#{namespace_name}/application/edit.jsx"
-            copy_file "pages/_form.jsx", "app/views/#{namespace_name}/application/_form.jsx"
+            copy_file_over_generated "pages/edit.jsx", "app/views/#{namespace_name}/application/edit.jsx",
+              generated_content: generated_page_stub("edit")
+            copy_file_unless_exists "pages/_form.jsx", "app/views/#{namespace_name}/application/_form.jsx"
             eject_new_view if should_eject_new?
           end
         end
@@ -45,7 +52,9 @@ module Terrazzo
           else
             "app/views/#{namespace_name}/application/new.jsx"
           end
+          return true if generated_file?(new_path, generated_page_stub("new"))
           return false if File.exist?(new_path)
+          return options[:with_counterpart] unless options[:with_counterpart].nil?
 
           yes?("Also eject the new view to share the custom form partial? (y/n)")
         end
@@ -53,10 +62,11 @@ module Terrazzo
         def eject_new_view
           if resource.present?
             eject_new_json_props
-            copy_file "pages/new.jsx", "app/views/#{namespace_name}/#{resource_path}/new.jsx"
+            copy_resource_page_file "pages/new.jsx", "app/views/#{namespace_name}/#{resource_path}/new.jsx"
             register_page_mapping("new")
           else
-            copy_file "pages/new.jsx", "app/views/#{namespace_name}/application/new.jsx"
+            copy_file_over_generated "pages/new.jsx", "app/views/#{namespace_name}/application/new.jsx",
+              generated_content: generated_page_stub("new")
           end
         end
 
@@ -68,10 +78,6 @@ module Terrazzo
           RUBY
         end
 
-        def resource_path
-          resource.underscore.pluralize
-        end
-
         def namespace_name
           options[:namespace]
         end

data/lib/generators/terrazzo/views/eject_compatibility.rb

@@ -0,0 +1,19 @@
+require "generators/terrazzo/eject/eject_generator"
+
+module Terrazzo
+  module Generators
+    module Views
+      module EjectCompatibility
+        private
+
+        def run_eject(target)
+          Terrazzo::Generators::EjectGenerator.start(
+            [target, "--namespace=#{namespace_name}"],
+            destination_root: destination_root,
+            behavior: behavior
+          )
+        end
+      end
+    end
+  end
+end

data/lib/generators/terrazzo/views/field_generator.rb

@@ -1,9 +1,12 @@
 require "rails/generators"
+require "generators/terrazzo/views/eject_compatibility"
 
 module Terrazzo
   module Generators
     module Views
       class FieldGenerator < Rails::Generators::Base
+        include EjectCompatibility
+
         source_root File.expand_path("templates", __dir__)
 
         class_option :namespace, type: :string, default: "admin",
@@ -13,16 +16,25 @@ module Terrazzo
           desc: "Specific field type to copy (e.g., string, number) or 'all'"
 
         def copy_field_templates
-          if field_type == "all"
-            directory "fields", "app/views/#{namespace_name}/fields"
-          else
-            directory "fields/shared", "app/views/#{namespace_name}/fields/shared"
-            directory "fields/#{field_type}", "app/views/#{namespace_name}/fields/#{field_type}"
-          end
+          field_types_to_eject.each { |name| run_eject("fields/#{name}") }
         end
 
         private
 
+        def field_types_to_eject
+          return built_in_field_types if field_type == "all"
+
+          [field_type == "money" ? "number" : field_type]
+        end
+
+        def built_in_field_types
+          Dir[File.join(self.class.source_root, "fields/*")]
+            .select { |path| File.directory?(path) }
+            .map { |path| File.basename(path) }
+            .reject { |name| name == "shared" }
+            .sort
+        end
+
         def namespace_name
           options[:namespace]
         end

data/lib/generators/terrazzo/views/generated_defaults_helper.rb

@@ -0,0 +1,110 @@
+module Terrazzo
+  module Generators
+    module Views
+      module GeneratedDefaultsHelper
+        PAGE_COMPONENTS = {
+          "index" => "AdminIndex",
+          "show" => "AdminShow",
+          "new" => "AdminNew",
+          "edit" => "AdminEdit",
+        }.freeze
+
+        private
+
+        def copy_file_over_generated(source, destination, generated_content:)
+          options = generated_file?(destination, generated_content) ? { force: true } : {}
+
+          copy_file source, destination, **options
+        end
+
+        def copy_file_unless_exists(source, destination)
+          if File.exist?(File.join(destination_root, destination))
+            say_status :skip, destination, :yellow
+            return
+          end
+
+          copy_file source, destination
+        end
+
+        def copy_resource_page_file(source, destination)
+          before = read_destination(destination)
+          generated_before = before == read_template(source)
+
+          copy_file source, destination
+          after = read_destination(destination)
+          rewrite_resource_page_imports(destination) if after && (before.nil? || after != before || generated_before)
+        end
+
+        def copy_resource_page_file_unless_exists(source, destination)
+          if File.exist?(File.join(destination_root, destination))
+            rewrite_resource_page_imports(destination) if read_destination(destination) == read_template(source)
+            say_status :skip, destination, :yellow
+            return
+          end
+
+          copy_file source, destination
+          rewrite_resource_page_imports(destination)
+        end
+
+        def generated_file?(destination, generated_content)
+          path = File.join(destination_root, destination)
+          File.exist?(path) && File.read(path) == generated_content
+        end
+
+        def generated_page_stub(name)
+          component = PAGE_COMPONENTS.fetch(name)
+
+          %(export { #{component} as default } from "terrazzo/pages";\n)
+        end
+
+        def generated_navigation_partial
+          <<~RUBY
+            resources = Terrazzo::Namespace.new(namespace).navigation_resources
+            navigation_groups = resources.group_by(&:navigation_group).map do |label, items|
+              { label: label, items: items }
+            end
+
+            json.array! navigation_groups do |group|
+              json.label group[:label]
+              json.items do
+                json.array! group[:items] do |r|
+                  json.label r.navigation_label
+                  json.path url_for(controller: "/\#{r.controller_path}", action: :index, only_path: true)
+                  json.active r.controller_path == controller_path
+                end
+              end
+            end
+          RUBY
+        end
+
+        def rewrite_resource_page_imports(destination)
+          path = File.join(destination_root, destination)
+          source = File.read(path)
+          prefix = page_barrel_import_prefix(destination)
+          rewritten = source.gsub(/from "\.\.\/(fields|components(?:\/ui)?)"/) do
+            %(from "#{prefix}#{Regexp.last_match(1)}")
+          end
+
+          File.write(path, rewritten) if rewritten != source
+        end
+
+        def read_destination(destination)
+          path = File.join(destination_root, destination)
+          File.read(path) if File.exist?(path)
+        end
+
+        def read_template(source)
+          File.read(File.join(self.class.source_root, source))
+        end
+
+        def page_barrel_import_prefix(destination)
+          relative_path = destination.delete_prefix("app/views/#{namespace_name}/")
+          directory = File.dirname(relative_path)
+          depth = directory.split("/").reject(&:empty?).length
+
+          "../" * depth
+        end
+      end
+    end
+  end
+end

data/lib/generators/terrazzo/views/index_generator.rb

@@ -1,10 +1,12 @@
 require "rails/generators"
+require_relative "generated_defaults_helper"
 require_relative "page_mapping_helper"
 
 module Terrazzo
   module Generators
     module Views
       class IndexGenerator < Rails::Generators::Base
+        include GeneratedDefaultsHelper
         include PageMappingHelper
 
         source_root File.expand_path("templates", __dir__)
@@ -16,14 +18,17 @@ module Terrazzo
           desc: "Admin namespace"
 
         def copy_index_template
+          ensure_page_barrels
+
           if resource.present?
             eject_json_props
-            copy_file "pages/index.jsx", "app/views/#{namespace_name}/#{resource_path}/index.jsx"
-            copy_file "pages/_collection.jsx", "app/views/#{namespace_name}/#{resource_path}/_collection.jsx"
+            copy_resource_page_file "pages/index.jsx", "app/views/#{namespace_name}/#{resource_path}/index.jsx"
+            copy_resource_page_file_unless_exists "pages/_collection.jsx", "app/views/#{namespace_name}/#{resource_path}/_collection.jsx"
             register_page_mapping("index")
           else
-            copy_file "pages/index.jsx", "app/views/#{namespace_name}/application/index.jsx"
-            copy_file "pages/_collection.jsx", "app/views/#{namespace_name}/application/_collection.jsx"
+            copy_file_over_generated "pages/index.jsx", "app/views/#{namespace_name}/application/index.jsx",
+              generated_content: generated_page_stub("index")
+            copy_file_unless_exists "pages/_collection.jsx", "app/views/#{namespace_name}/application/_collection.jsx"
           end
         end
 
@@ -37,10 +42,6 @@ module Terrazzo
           RUBY
         end
 
-        def resource_path
-          resource.underscore.pluralize
-        end
-
         def namespace_name
           options[:namespace]
         end

data/lib/generators/terrazzo/views/layout_generator.rb

@@ -1,18 +1,19 @@
 require "rails/generators"
+require "generators/terrazzo/views/eject_compatibility"
 
 module Terrazzo
   module Generators
     module Views
       class LayoutGenerator < Rails::Generators::Base
+        include EjectCompatibility
+
         source_root File.expand_path("templates", __dir__)
 
         class_option :namespace, type: :string, default: "admin",
           desc: "Admin namespace"
 
         def copy_layout_components
-          %w[Layout.jsx app-sidebar.jsx site-header.jsx FlashMessages.jsx].each do |file|
-            copy_file "components/#{file}", "app/views/#{namespace_name}/components/#{file}"
-          end
+          run_eject("components/Layout")
         end
 
         private

data/lib/generators/terrazzo/views/navigation_generator.rb

@@ -1,16 +1,20 @@
 require "rails/generators"
+require "generators/terrazzo/views/eject_compatibility"
 
 module Terrazzo
   module Generators
     module Views
       class NavigationGenerator < Rails::Generators::Base
+        include EjectCompatibility
+
         source_root File.expand_path("templates", __dir__)
 
         class_option :namespace, type: :string, default: "admin",
           desc: "Admin namespace"
 
         def copy_navigation
-          copy_file "components/app-sidebar.jsx", "app/views/#{namespace_name}/components/app-sidebar.jsx"
+          run_eject("navigation")
+          run_eject("components/app-sidebar")
         end
 
         private

data/lib/generators/terrazzo/views/new_generator.rb

@@ -1,10 +1,12 @@
 require "rails/generators"
+require_relative "generated_defaults_helper"
 require_relative "page_mapping_helper"
 
 module Terrazzo
   module Generators
     module Views
       class NewGenerator < Rails::Generators::Base
+        include GeneratedDefaultsHelper
         include PageMappingHelper
 
         source_root File.expand_path("templates", __dir__)
@@ -14,17 +16,22 @@ module Terrazzo
 
         class_option :namespace, type: :string, default: "admin",
           desc: "Admin namespace"
+        class_option :with_counterpart, type: :boolean, default: nil,
+          desc: "Also eject the edit view that shares this form partial"
 
         def copy_new_template
+          ensure_page_barrels
+
           if resource.present?
             eject_json_props
-            copy_file "pages/new.jsx", "app/views/#{namespace_name}/#{resource_path}/new.jsx"
-            copy_file "pages/_form.jsx", "app/views/#{namespace_name}/#{resource_path}/_form.jsx"
+            copy_resource_page_file "pages/new.jsx", "app/views/#{namespace_name}/#{resource_path}/new.jsx"
+            copy_resource_page_file_unless_exists "pages/_form.jsx", "app/views/#{namespace_name}/#{resource_path}/_form.jsx"
             register_page_mapping("new")
             eject_edit_view if should_eject_edit?
           else
-            copy_file "pages/new.jsx", "app/views/#{namespace_name}/application/new.jsx"
-            copy_file "pages/_form.jsx", "app/views/#{namespace_name}/application/_form.jsx"
+            copy_file_over_generated "pages/new.jsx", "app/views/#{namespace_name}/application/new.jsx",
+              generated_content: generated_page_stub("new")
+            copy_file_unless_exists "pages/_form.jsx", "app/views/#{namespace_name}/application/_form.jsx"
             eject_edit_view if should_eject_edit?
           end
         end
@@ -45,7 +52,9 @@ module Terrazzo
           else
             "app/views/#{namespace_name}/application/edit.jsx"
           end
+          return true if generated_file?(edit_path, generated_page_stub("edit"))
           return false if File.exist?(edit_path)
+          return options[:with_counterpart] unless options[:with_counterpart].nil?
 
           yes?("Also eject the edit view to share the custom form partial? (y/n)")
         end
@@ -53,10 +62,11 @@ module Terrazzo
         def eject_edit_view
           if resource.present?
             eject_edit_json_props
-            copy_file "pages/edit.jsx", "app/views/#{namespace_name}/#{resource_path}/edit.jsx"
+            copy_resource_page_file "pages/edit.jsx", "app/views/#{namespace_name}/#{resource_path}/edit.jsx"
             register_page_mapping("edit")
           else
-            copy_file "pages/edit.jsx", "app/views/#{namespace_name}/application/edit.jsx"
+            copy_file_over_generated "pages/edit.jsx", "app/views/#{namespace_name}/application/edit.jsx",
+              generated_content: generated_page_stub("edit")
           end
         end
 
@@ -68,10 +78,6 @@ module Terrazzo
           RUBY
         end
 
-        def resource_path
-          resource.underscore.pluralize
-        end
-
         def namespace_name
           options[:namespace]
         end