sorbet_view 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90d970f9f128a630593f84d69ad5f1882b382754dbe1066a86881e73b8d02b1e
-  data.tar.gz: efd75504c02a0dcf59621011cf978e648de00157bf317bed2e52565d9d8fb56d
+  metadata.gz: 330016607634f904162184802a0fb8efa933da90179b192b1e3113a296ccf113
+  data.tar.gz: 1770334f364c5eae2b56ffe15ce222f157cc8eb7c53a94e371f8d4103a91a8fb
 SHA512:
-  metadata.gz: 1053ce748716793362dd0b66296a5710a270fb97e48ef81fc944b3e737078603bcdcc145f6d8f90ea2298df33e389847239505c8d427edf49fb89d4ec01d5b41
-  data.tar.gz: e71fab2eff5ffda2a5acb7e80b479882e3309b82b5bccb5c1e153d08896e2c1bdcd09f9c03800c9249be4fc5b9b558400453a0c69048b71543ce1eee5c2f075e
+  metadata.gz: f2381a372dc8ebb770e7e73e978a2af499d1e83ea2664a55d4e9657b0a7296118edbaa5150867a72caa667d0121a21a9da153266377f0f93d1d167a0409efefc
+  data.tar.gz: 185f3fed2527ddc2a7011550c0d1a2b7a21872164949ddbd5a74fee9627fa7fc1397e7bf80ba4477e1b20626cbd320c123dc83a5e5a6e6a0848c32f41319538c

data/lib/sorbet_view/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module SorbetView
-  VERSION = '0.16.1'
+  VERSION = '0.17.0'
 end

data/lib/tapioca/dsl/compilers/sorbet_view.rb

@@ -28,6 +28,9 @@ module Tapioca
           @module_cache = T.let({}, T::Hash[String, RBI::Scope])
           @project = T.let(SrbLens::Project.load_or_index(Dir.pwd), T.untyped)
 
+          # Ensure all controllers are loaded
+          Rails.application.eager_load! if defined?(Rails) && Rails.respond_to?(:application)
+
           controllers = ObjectSpace.each_object(Class).select do |klass|
             klass < ::ActionController::Base && !klass.abstract?
           rescue StandardError
@@ -238,27 +241,34 @@ module Tapioca
         sig { params(controller: T.untyped).void }
         def process_controller(controller)
           helper_methods = extract_helper_methods(controller)
-          return if helper_methods.empty?
+          controller_helper_modules = extract_controller_helper_modules(controller)
+          return if helper_methods.empty? && controller_helper_modules.empty?
 
           path = controller.controller_path
           parts = path.split('/').map { |p| camelize(p) }
 
-          # 1) module SorbetView::Helpers::<controller_path> with helper methods
-          helper_module_name = "SorbetView::Helpers::#{parts.join('::')}"
-          create_module_from_path(helper_module_name) do |mod|
-            helper_methods.each do |method_name, params, return_type|
-              mod.create_method(method_name, parameters: params, return_type: return_type)
+          # 1) module SorbetView::Helpers::<controller_path> with helper methods from helper_method macro
+          helper_module_name = nil
+          unless helper_methods.empty?
+            helper_module_name = "SorbetView::Helpers::#{parts.join('::')}"
+            create_module_from_path(helper_module_name) do |mod|
+              helper_methods.each do |method_name, params, return_type|
+                mod.create_method(method_name, parameters: params, return_type: return_type)
+              end
             end
           end
 
-          # 2) Each action's template class includes the helper module
+          # 2) Each action's template class includes the helper module and controller-specific helper modules
           actions = controller.action_methods.to_a
           actions.each do |action_name|
             next unless action_name.match?(/\A[a-zA-Z_][a-zA-Z0-9_]*\z/)
 
             class_name = "SorbetView::Generated::#{parts.join('::')}::#{camelize(action_name)}"
             create_class_from_path(class_name) do |klass|
-              klass.create_include(helper_module_name)
+              klass.create_include(helper_module_name) if helper_module_name
+              controller_helper_modules.each do |mod_name|
+                klass.create_include("::#{mod_name}")
+              end
             end
           end
         end
@@ -285,6 +295,30 @@ module Tapioca
           end
         end
 
+        # Returns controller-specific helper module names (modules included via `helper` that are not in ApplicationController)
+        sig { params(controller: T.untyped).returns(T::Array[String]) }
+        def extract_controller_helper_modules(controller)
+          return [] unless controller.respond_to?(:_helpers)
+
+          base_helpers = if defined?(::ApplicationController) && ::ApplicationController.respond_to?(:_helpers)
+            ::ApplicationController._helpers.ancestors
+          else
+            []
+          end
+
+          controller_helpers = controller._helpers.ancestors
+          specific_modules = controller_helpers - base_helpers
+
+          specific_modules.filter_map do |mod|
+            next unless mod.is_a?(Module) && !mod.is_a?(Class)
+            name = mod.name
+            next if name.nil? || name.empty?
+            next if name.include?('HelperMethods')
+            next if name.start_with?('ActionController::') || name.start_with?('AbstractController::')
+            name
+          end
+        end
+
         sig { params(controller: T.untyped, method_name: String).returns(T.untyped) }
         def find_method_info(controller, method_name)
           methods = @project.find_methods("#{controller.name}##{method_name}")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sorbet_view
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - kazuma
 bindir: exe
 cert_chain: []
-date: 2026-04-02 00:00:00.000000000 Z
+date: 2026-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: herb