sorbet_view 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19cbb3af668f9a79a3cad67007559a4e7cb5957c855bf1576c76469d9de7de3a
-  data.tar.gz: 0d192ba1ad47f3e1ca3ab092307ad87de92f633bbddaae74bcfc7cf9ac4f1eed
+  metadata.gz: b85b20a942dbfaf73a6f5a89f36cfd6853e904ebbda437a3327b0fd31acb7d2e
+  data.tar.gz: 3aa9e2a536f1ddb491ff2fbc10994115434c6d27713a7f4d122ce130b9f695f2
 SHA512:
-  metadata.gz: ba54aa8d1a88981103c875dcea2926bc1c67cff801682abce54b0bd00bac70dd3d1937b5f6a156cd432d93f05674b2baf60d61d6001c04df991d5ced5118ab04
-  data.tar.gz: 6b79b5dd47f1b22ffd338dca0c273d294915a1bbd0dc1d5669f3f6db1f114020ebf47ca1b7b786160d648f538c178f0618f2cc563d754c231be97694b2f49062
+  metadata.gz: 2fc47b3223e1d8b148fabff24d1dda049a2f02de381e3b5a23af5df095a18793f85b9a69203f3122e85866303ca3840a6785429eeeb4ecb7f1abbf62079439ce
+  data.tar.gz: 04c45489cb6fa27ae97644169f31c556a8a31fc01fe5b3282269e5fe0b747f830f6472a338886ae88faad5ba644386978fad832a6f7a19efbd7f2ce10f9fac08

data/lib/sorbet_view/cli/runner.rb

@@ -141,9 +141,10 @@ module SorbetView
 
         sig { params(args: T::Array[String]).void }
         def run_lsp(args)
+          _, sorbet_args = split_args(args)
           $stdin.binmode
           $stdout.binmode
-          server = Lsp::Server.new
+          server = Lsp::Server.new(sorbet_args: sorbet_args)
           server.start
         end
 
@@ -192,7 +193,7 @@ module SorbetView
           puts '  [paths...]         Input directories (overrides config)'
           puts '  -o, --output DIR   Output directory (overrides config)'
           puts '  --no-config        Ignore .sorbet_view.yml'
-          puts '  -- [args...]       Pass remaining args to srb tc (tc only)'
+          puts '  -- [args...]       Pass remaining args to srb tc (tc/lsp)'
         end
 
         sig { params(path: String).returns(T::Boolean) }

data/lib/sorbet_view/compiler/ruby_generator.rb

@@ -89,10 +89,14 @@ module SorbetView
         method_args = component_mode ? '' : (locals || '()')
         lines << "  def __sorbet_view_render#{method_args}"
 
-        # Declare undefined instance variables as NilClass
-        undefined_ivars = find_undefined_ivars(code_segments, context, config, component_mode)
-        undefined_ivars.each do |ivar|
-          lines << "    #{ivar} = T.let(nil, NilClass)"
+        # Declare instance variables with types from srb-lens (or NilClass for unknown)
+        resolved_ivars = resolve_ivar_types(code_segments, context, config, component_mode)
+        resolved_ivars.each do |ivar, type|
+          if type == 'NilClass'
+            lines << "    #{ivar} = T.let(nil, NilClass)"
+          else
+            lines << "    #{ivar} = T.let(T.unsafe(nil), #{type})"
+          end
         end
 
         # Body: extracted Ruby code
@@ -153,26 +157,32 @@ module SorbetView
         segments.flat_map { |seg| seg.code.scan(/(?<!@)@[a-zA-Z_]\w*/) }.uniq.sort
       end
 
-      # Find instance variables used in the template but not defined
+      # Resolve types for all instance variables used in the template
+      # Returns [["@var", "Type"], ...] — defined ivars get their srb-lens type, undefined get NilClass
       sig do
         params(
           segments: T::Array[RubySegment],
           context: TemplateContext,
           config: Configuration,
           component_mode: T::Boolean
-        ).returns(T::Array[String])
+        ).returns(T::Array[[String, String]])
       end
-      def find_undefined_ivars(segments, context, config, component_mode)
+      def resolve_ivar_types(segments, context, config, component_mode)
         all_ivars = collect_ivars(segments)
         return [] if all_ivars.empty?
 
-        defined_ivars = if component_mode
-          load_component_defined_ivars(context.template_path)
+        if component_mode
+          # Component mode: ivars defined in source are omitted, undefined get NilClass
+          defined_ivars = load_component_defined_ivars(context.template_path)
+          (all_ivars - defined_ivars).map { |ivar| [ivar, 'NilClass'] }
         else
-          load_view_defined_ivars(context.template_path, config)
+          # View mode: use typed ivar mapping from srb-lens
+          ivar_types = load_view_ivar_types(context.template_path, config)
+          all_ivars.map do |ivar|
+            type = ivar_types[ivar]
+            [ivar, type || 'NilClass']
+          end
         end
-
-        all_ivars - defined_ivars
       end
 
       # Scan the component .rb source for @var = assignments
@@ -184,27 +194,24 @@ module SorbetView
         source.scan(/(?<!@)@([a-zA-Z_]\w*)\s*(?:=|\|\|=)/).map { |m| "@#{m[0]}" }.uniq
       end
 
-      # Load defined ivars from the Tapioca-generated mapping for views
-      sig { params(template_path: String, config: Configuration).returns(T::Array[String]) }
-      def load_view_defined_ivars(template_path, config)
+      # Load ivar type mapping from the Tapioca-generated JSON
+      # Returns { "@var" => "Type" } for the matching template
+      sig { params(template_path: String, config: Configuration).returns(T::Hash[String, String]) }
+      def load_view_ivar_types(template_path, config)
         mapping_path = File.join(config.output_dir, '.defined_ivars.json')
-        return [] unless File.exist?(mapping_path)
+        return {} unless File.exist?(mapping_path)
 
-        @ivar_mapping = T.let(@ivar_mapping, T.nilable(T::Hash[String, T::Array[String]]))
+        @ivar_mapping = T.let(@ivar_mapping, T.nilable(T::Hash[String, T::Hash[String, String]]))
         @ivar_mapping ||= begin
           JSON.parse(File.read(mapping_path))
         rescue JSON::ParserError
           {}
         end
 
-        # Derive controller_path from template_path
-        # app/views/posts/show.html.erb → posts
-        # app/views/admin_area/v21/booths/show.html.erb → admin_area/v21/booths
-        controller_path = template_path
-          .sub(%r{^app/views/}, '')
-          .sub(%r{/[^/]+$}, '') # strip filename
-
-        @ivar_mapping[controller_path] || []
+        # Lookup by template path (without extensions)
+        # "app/views/posts/show.html.erb" → "app/views/posts/show"
+        template_key = template_path.sub(/\..*\z/, '')
+        @ivar_mapping[template_key] || {}
       end
     end
   end

data/lib/sorbet_view/compiler/template_context.rb

@@ -32,7 +32,7 @@ module SorbetView
       sig { params(template_path: String, config: Configuration).returns(TemplateContext) }
       def self.resolve(template_path, config)
         ruby_path = File.join(config.output_dir, "#{template_path}.rb")
-        classification = classify(template_path)
+        classification = classify(template_path, config)
 
         case classification
         when :mailer_view
@@ -53,29 +53,46 @@ module SorbetView
 
         private
 
-        sig { params(path: String).returns(Symbol) }
-        def classify(path)
+        # Strip the matching input_dir prefix from a template path
+        # "app/views/users/show.html.erb" → "users/show.html.erb"
+        # "app/users/show.html.erb" (input_dirs: ['app/']) → "users/show.html.erb"
+        sig { params(path: String, config: Configuration).returns(String) }
+        def strip_input_dir(path, config)
+          config.input_dirs.each do |dir|
+            prefix = dir.end_with?('/') ? dir : "#{dir}/"
+            if path.start_with?(prefix)
+              relative = path.delete_prefix(prefix)
+              # Also strip "views/" if the input_dir didn't include it
+              # e.g. input_dirs: ['app/'] with path 'app/views/users/show.html.erb'
+              relative = relative.delete_prefix('views/') if relative.start_with?('views/')
+              return relative
+            end
+          end
+          path
+        end
+
+        sig { params(path: String, config: Configuration).returns(Symbol) }
+        def classify(path, config)
           basename = File.basename(path)
+          relative = strip_input_dir(path, config)
 
           if path.include?('_mailer/') || path.include?('mailers/')
             :mailer_view
-          elsif path.include?('app/views/layouts/')
+          elsif relative.start_with?('layouts/')
             :layout
           elsif basename.start_with?('_')
             :partial
-          elsif path.include?('app/views/')
+          elsif relative != path
+            # input_dir prefix was stripped → this is a view under input_dirs
             :controller_view
           else
             :generic
           end
         end
 
-        sig { params(path: String).returns(String) }
-        def path_to_class_name(path)
-          # /abs/path/app/views/users/show.html.erb -> Users::Show
-          relative = path
-            .sub(%r{.*app/views/}, '')
-            .sub(%r{.*app/}, '')
+        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
           basename = basename.delete_prefix('_') # strip partial prefix
           dir = File.dirname(relative)
@@ -97,7 +114,7 @@ module SorbetView
         sig { params(path: String, ruby_path: String, config: Configuration).returns(TemplateContext) }
         def resolve_controller_view(path, ruby_path, config)
           new(
-            class_name: "SorbetView::Generated::#{path_to_class_name(path)}",
+            class_name: "SorbetView::Generated::#{path_to_class_name(path, config)}",
             superclass: nil,
             includes: [
               '::ActionView::Helpers',
@@ -112,7 +129,7 @@ module SorbetView
         sig { params(path: String, ruby_path: String, config: Configuration).returns(TemplateContext) }
         def resolve_mailer_view(path, ruby_path, config)
           new(
-            class_name: "SorbetView::Generated::#{path_to_class_name(path)}",
+            class_name: "SorbetView::Generated::#{path_to_class_name(path, config)}",
             superclass: nil,
             includes: [
               '::ActionView::Helpers',
@@ -127,7 +144,7 @@ module SorbetView
         sig { params(path: String, ruby_path: String, config: Configuration).returns(TemplateContext) }
         def resolve_layout(path, ruby_path, config)
           new(
-            class_name: "SorbetView::Generated::#{path_to_class_name(path)}",
+            class_name: "SorbetView::Generated::#{path_to_class_name(path, config)}",
             superclass: nil,
             includes: [
               '::ActionView::Helpers',
@@ -142,7 +159,7 @@ module SorbetView
         sig { params(path: String, ruby_path: String, config: Configuration).returns(TemplateContext) }
         def resolve_partial(path, ruby_path, config)
           new(
-            class_name: "SorbetView::Generated::#{path_to_class_name(path)}",
+            class_name: "SorbetView::Generated::#{path_to_class_name(path, config)}",
             superclass: nil,
             includes: [
               '::ActionView::Helpers',
@@ -157,7 +174,7 @@ module SorbetView
         sig { params(path: String, ruby_path: String, config: Configuration).returns(TemplateContext) }
         def resolve_generic(path, ruby_path, config)
           new(
-            class_name: "SorbetView::Generated::#{path_to_class_name(path)}",
+            class_name: "SorbetView::Generated::#{path_to_class_name(path, config)}",
             superclass: nil,
             includes: config.extra_includes,
             template_path: path,

data/lib/sorbet_view/configuration.rb

@@ -15,6 +15,7 @@ module SorbetView
     const :typed_level, String, default: 'true'
     const :path_mapping, T::Hash[String, String], default: {}
     const :component_dirs, T::Array[String], default: []
+    const :sorbet_options, T::Array[String], default: []
 
     class << self
       extend T::Sig

data/lib/sorbet_view/lsp/server.rb

@@ -9,9 +9,10 @@ module SorbetView
     class Server
       extend T::Sig
 
-      sig { params(input: IO, output: IO).void }
-      def initialize(input: $stdin, output: $stdout)
+      sig { params(input: IO, output: IO, sorbet_args: T::Array[String]).void }
+      def initialize(input: $stdin, output: $stdout, sorbet_args: [])
         @config = T.let(Configuration.load, Configuration)
+        @sorbet_args = T.let(sorbet_args, T::Array[String])
         @logger = T.let(Logger.new(File.open('sorbet_view_lsp.log', 'a')), Logger)
         @transport = T.let(Transport.new(input: input, output: output), Transport)
         @document_store = T.let(DocumentStore.new, DocumentStore)
@@ -100,7 +101,7 @@ module SorbetView
         compile_all_templates
 
         # Start Sorbet LSP
-        @sorbet.start
+        @sorbet.start(extra_args: @sorbet_args)
 
         # Register handler for diagnostics from Sorbet
         @sorbet.on_notification('textDocument/publishDiagnostics') do |msg|

data/lib/sorbet_view/lsp/sorbet_process.rb

@@ -24,13 +24,15 @@ module SorbetView
         @next_id = T.let(1, Integer)
       end
 
-      sig { void }
-      def start
+      sig { params(extra_args: T::Array[String]).void }
+      def start(extra_args: [])
         cmd = [
           @config.sorbet_path,
           'tc',
           '--lsp',
-          '--enable-all-experimental-lsp-features'
+          '--enable-all-experimental-lsp-features',
+          *@config.sorbet_options,
+          *extra_args
         ]
 
         @logger.info("Starting Sorbet: #{cmd.join(' ')}")

data/lib/sorbet_view/version.rb

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

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

@@ -44,17 +44,37 @@ module Tapioca
 
         private
 
-        # Generate a mapping of controller_path -> defined instance variables
-        # Used by the compiler to declare undefined ivars as NilClass
+        # Generate a mapping of template_path -> { ivar => type }
+        # Used by the compiler to declare ivars with proper types
         sig { params(controllers: T::Array[T.untyped]).void }
         def generate_ivar_mapping(controllers)
           config = ::SorbetView::Configuration.load
-          mapping = T.let({}, T::Hash[String, T::Array[String]])
+          mapping = T.let({}, T::Hash[String, T::Hash[String, String]])
+
+          # Get view directories from Rails (e.g. ["app/views"])
+          view_dirs = resolve_view_dirs
 
           controllers.each do |controller|
             path = controller.controller_path
-            ivars = extract_defined_ivars(controller)
-            mapping[path] = ivars unless ivars.empty?
+
+            controller.action_methods.each do |action_name|
+              next unless action_name.match?(/\A[a-zA-Z_][a-zA-Z0-9_]*\z/)
+
+              action_ivars = extract_ivars_from_srb_lens(controller, action_name.to_s)
+              next if action_ivars.empty?
+
+              # Template-path keys: "app/views/posts/show" => { "@post" => "Post" }
+              view_dirs.each do |vd|
+                template_key = File.join(vd, path, action_name.to_s)
+                existing = mapping[template_key]
+                if existing
+                  # Multiple actions render the same template: narrow to intersection
+                  mapping[template_key] = intersect_ivars(existing, action_ivars)
+                else
+                  mapping[template_key] = action_ivars
+                end
+              end
+            end
           end
 
           mapping_path = File.join(config.output_dir, '.defined_ivars.json')
@@ -64,14 +84,59 @@ module Tapioca
           # Non-critical: if mapping fails, all ivars default to NilClass
         end
 
-        # Extract instance variables assigned in the controller source
-        sig { params(controller: T.untyped).returns(T::Array[String]) }
-        def extract_defined_ivars(controller)
-          source_file = "app/controllers/#{controller.controller_path}_controller.rb"
-          return [] unless File.exist?(source_file)
+        # Resolve view directories from Rails, relative to project root
+        sig { returns(T::Array[String]) }
+        def resolve_view_dirs
+          if defined?(::ActionController::Base) && ::ActionController::Base.respond_to?(:view_paths)
+            ::ActionController::Base.view_paths.paths.filter_map do |p|
+              path_str = p.to_s
+              relative = path_str.sub(%r{^#{Regexp.escape(Dir.pwd)}/?}, '')
+              relative unless relative.empty?
+            end
+          else
+            ['app/views']
+          end
+        rescue StandardError
+          ['app/views']
+        end
+
+        # Intersect two ivar mappings: keep only ivars present in both, narrow types with T.all
+        sig { params(a: T::Hash[String, String], b: T::Hash[String, String]).returns(T::Hash[String, String]) }
+        def intersect_ivars(a, b)
+          common_keys = a.keys & b.keys
+          result = T.let({}, T::Hash[String, String])
+          common_keys.each do |key|
+            type_a = T.must(a[key])
+            type_b = T.must(b[key])
+            result[key] = if type_a == type_b
+              type_a
+            else
+              "T.all(#{type_a}, #{type_b})"
+            end
+          end
+          result
+        end
 
-          source = File.read(source_file)
-          source.scan(/(?<!@)@([a-zA-Z_]\w*)\s*(?:=|\|\|=)/).map { |m| "@#{m[0]}" }.uniq.sort
+        # Extract instance variables and their types from srb-lens for a controller action
+        sig { params(controller: T.untyped, action_name: String).returns(T::Hash[String, String]) }
+        def extract_ivars_from_srb_lens(controller, action_name)
+          methods = @project.find_methods("#{controller.name}##{action_name}")
+          method_info = methods&.first
+          return {} unless method_info
+
+          ivars = method_info.ivars
+          return {} if ivars.nil? || ivars.empty?
+
+          result = T.let({}, T::Hash[String, String])
+          ivars.each do |ivar|
+            name = ivar.name
+            type = ivar.type
+            next if name.nil? || name.empty?
+            next if type.nil? || type.empty?
+
+            result[name] = type
+          end
+          result
         end
 
         sig { void }

metadata

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