sorbet_view 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241f449c7d85bd172dd1f14e69f2dd3c3baf9a2590d932a81437bcb7256697e9
-  data.tar.gz: 486cc137199d7a8e0fbda04baf528f139abd43585870108305ca9ece45f99a6e
+  metadata.gz: 017d85569d51f043ad35ece80c0782cd08055a7c2cdbef352e251ef6731edb09
+  data.tar.gz: 868bbd6562e38ca92e892948cd08a16e069656c864738e9e9605e6951e96e25a
 SHA512:
-  metadata.gz: 78b9b224b0c202d58ab0f707f9333d8972298b11b707e735efd8f8da58eb93b21c24061f5a2b6fc0ea2fb207e2840df83351b6759a4ae8372d84391a390813c7
-  data.tar.gz: faf509cd68a7f7eb35f2e826a3bdc514681afad57e8900ce079269b58ec4d5321d5cba66e1aee7199f8eeb59eec0a58cf97bcc0440e142e351a0ea846f618a22
+  metadata.gz: de2c968505b5f8b727aa4fa8f07486639786b608ae464e10eac6d11fc121c594e5e3e11962b54e5900efee3fe37acd17a2df3645f2133bed8739844464c4777f
+  data.tar.gz: 729aea79089ee0b7f2e1d7780ea0fd4bda21857d32b43df6d2f9fbe114de76e32534da5eacb98d3f2adc6e8927608ebb4c6624087e0a711dfbc550288a4f22a0

data/lib/sorbet_view/compiler/ruby_generator.rb

@@ -117,17 +117,19 @@ module SorbetView
 
             lines << "    #{stripped}"
 
-            # Build mapping entry
+            # Build mapping entry — for the first line we already advanced past
+            # leading whitespace in the adapter; for subsequent lines, use the
+            # actual indent of the source line so the template column matches.
             template_start_col = if i == 0
               seg.column
             else
-              0
+              code_line.length - code_line.lstrip.length
             end
 
             mapping_entries << SourceMap::MappingEntry.new(
               template_range: SourceMap::Range.new(
                 start: SourceMap::Position.new(line: seg.line + i, column: template_start_col),
-                end_: SourceMap::Position.new(line: seg.line + i, column: template_start_col + code_line.strip.length)
+                end_: SourceMap::Position.new(line: seg.line + i, column: template_start_col + stripped.length)
               ),
               ruby_range: SourceMap::Range.new(
                 start: SourceMap::Position.new(line: ruby_line, column: 4),

data/lib/sorbet_view/compiler/template_context.rb

@@ -93,8 +93,18 @@ module SorbetView
         sig { params(path: String, config: Configuration).returns(String) }
         def path_to_class_name(path, config)
           relative = strip_input_dir(path, config)
-          basename = File.basename(relative).sub(/\..*$/, '') # strip all extensions
+          filename = File.basename(relative)
+          filename_parts = filename.split('.')
+
+          basename = T.must(filename_parts.first)
           basename = basename.delete_prefix('_') # strip partial prefix
+
+          # With 3+ parts (e.g. show.html.erb → [show, html, erb]), the last is the
+          # template handler and the middle parts are format/variant extensions.
+          # Nest them as sub-classes so show.html.erb and show.turbo_stream.erb
+          # don't collide as the same class name.
+          format_parts = filename_parts.length >= 3 ? T.must(filename_parts[1..-2]) : []
+
           dir = File.dirname(relative)
 
           parts = if dir == '.'
@@ -103,6 +113,8 @@ module SorbetView
             dir.split('/') + [basename]
           end
 
+          parts += format_parts
+
           parts.map { |p| camelize(p) }.join('::')
         end
 

data/lib/sorbet_view/version.rb

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

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

@@ -258,21 +258,51 @@ module Tapioca
             end
           end
 
-          # 2) Each action's template class includes the helper module and controller-specific helper modules
+          # 2) Each action's template class includes the helper module and controller-specific helper modules.
+          # Templates compile to format-nested classes (e.g. Users::Show::Html, Users::Show::TurboStream),
+          # so emit RBI for each format variant found on disk. Falls back to the action-base class
+          # when no format-suffixed templates exist.
           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) if helper_module_name
-              controller_helper_modules.each do |mod_name|
-                klass.create_include("::#{mod_name}")
+            base_class_name = "SorbetView::Generated::#{parts.join('::')}::#{camelize(action_name)}"
+            format_suffixes = find_template_format_suffixes(path, action_name.to_s)
+            class_names = format_suffixes.empty? ? [base_class_name] : format_suffixes.map { |fs| "#{base_class_name}::#{fs}" }
+
+            class_names.each do |class_name|
+              create_class_from_path(class_name) do |klass|
+                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
         end
 
+        # Scan view dirs for format suffixes of a given action's templates.
+        # e.g. ["Html", "TurboStream"] for show.html.erb + show.turbo_stream.erb.
+        # Templates with no format (e.g. show.erb) contribute no suffix — for those,
+        # callers fall back to the action-base class name.
+        sig { params(controller_path: String, action_name: String).returns(T::Array[String]) }
+        def find_template_format_suffixes(controller_path, action_name)
+          suffixes = T.let([], T::Array[String])
+
+          resolve_view_dirs.each do |vd|
+            Dir.glob(File.join(vd, controller_path, "#{action_name}.*")).each do |file|
+              fname_parts = File.basename(file).split('.')
+              next unless fname_parts.first == action_name
+              next unless fname_parts.length >= 3
+
+              middle_parts = T.must(fname_parts[1..-2])
+              suffixes << middle_parts.map { |p| camelize(p) }.join('::')
+            end
+          end
+
+          suffixes.uniq
+        end
+
         # Returns [[method_name, params, return_type], ...]
         sig { params(controller: T.untyped).returns(T::Array[T.untyped]) }
         def extract_helper_methods(controller)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet_view
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - kazuma