sorbet_view 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e66c3f2247cf3bcf0c65887aceb780fe6c2048aa733e819a4fe9afaf641c8b3
-  data.tar.gz: 133411c911ab5b2035288b04c94c92be6077c4b5180a5cffd125a036ce44cc6e
+  metadata.gz: c74f0ac2be7deb8aa466c27b4b4558852ebd4de838ada96d434650bb9c5bad0c
+  data.tar.gz: 4d807c4126e1f272397d4cad1b38c2a5f3341616df90aab21b3efb621874e992
 SHA512:
-  metadata.gz: a463b522df92117937a8c8b4021d7156d7014074985ce0d766b4bbfd2020f54153aa7232e51def28137125943e34cd340b81ab0ea10dc05bf0b07fc714dcea1c
-  data.tar.gz: '09afa6e9b68798b63680770f8e9d9ef7fb2148f817d55a00c91b77e486693ab014c9a7c2df0729f64c8cf409b0102917b6c1127eb935c60c520375cd6a20595b'
+  metadata.gz: b8a488ac1a4299128cd8ec4df072c4098a8b801bd080f34cf7e29353f47303ef4eb05e22b89ba56b5dae32e1e9f7edb5325333c11e132610aa13d4c882a287e2
+  data.tar.gz: 2d40c0ce178370b135c91e8f49cd4e3f2f7fec3dc114849497afc2af3a8326523df09b1cf0362e512e4fa2d87b808db8b11c24325736dc582348ef9b0e556444

data/README.md

@@ -60,6 +60,9 @@ skip_missing_locals: true
 | `sorbet_path` | `'srb'` | Path to the Sorbet binary |
 | `typed_level` | `'true'` | Sorbet `typed` level for generated files |
 | `component_dirs` | `[]` | Directories to scan for ViewComponent files |
+| `controller_dirs` | `['app/controllers']` | Controller directories to watch for changes (LSP recompiles associated templates) |
+| `path_mapping` | `{}` | Path mapping for remote development (e.g., Docker) |
+| `sorbet_options` | `[]` | Additional options passed to Sorbet |
 
 ## Usage
 
@@ -122,12 +125,24 @@ Components using `erb_template` heredocs are automatically detected and compiled
 
 ## Tapioca integration
 
-SorbetView includes a Tapioca DSL compiler that generates RBI files for controller helper methods. Run:
+SorbetView includes a Tapioca DSL compiler that generates RBI files for controller helper methods and extracts instance variable types from controller actions using [srb_lens](https://github.com/kazzix14/srb_lens).
 
 ```bash
 bundle exec tapioca dsl
 ```
 
+This generates:
+- RBI files for helper methods
+- `.defined_ivars.json` mapping template paths to instance variable types
+
+After running `tapioca dsl`, recompile templates to apply the updated types:
+
+```bash
+bundle exec sv compile
+```
+
+When using the LSP server, templates are automatically recompiled when the corresponding controller file is saved.
+
 ## Requirements
 
 - Ruby >= 3.2

data/lib/sorbet_view/compiler/ruby_generator.rb

@@ -149,6 +149,11 @@ module SorbetView
         )
       end
 
+      sig { void }
+      def invalidate_ivar_cache!
+        @ivar_mapping = nil
+      end
+
       private
 
       # Collect @variable references from code segments
@@ -169,16 +174,19 @@ module SorbetView
       end
       def resolve_ivar_types(segments, context, config, component_mode)
         all_ivars = collect_ivars(segments)
-        return [] if all_ivars.empty?
 
         if component_mode
+          return [] if all_ivars.empty?
           # 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
           # View mode: use typed ivar mapping from srb-lens
           ivar_types = load_view_ivar_types(context.template_path, config)
-          all_ivars.map do |ivar|
+          # Include all ivars: those used in the template + those defined in the controller
+          combined_ivars = (all_ivars + ivar_types.keys).uniq.sort
+          return [] if combined_ivars.empty?
+          combined_ivars.map do |ivar|
             type = ivar_types[ivar]
             [ivar, type || 'NilClass']
           end

data/lib/sorbet_view/compiler/template_compiler.rb

@@ -13,6 +13,11 @@ module SorbetView
         @config = config
       end
 
+      sig { void }
+      def invalidate_ivar_cache!
+        @generator.invalidate_ivar_cache!
+      end
+
       sig { params(template_path: String, source: String).returns(CompileResult) }
       def compile(template_path, source)
         Perf.measure('compiler.compile') do

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 :controller_dirs, T::Array[String], default: ['app/controllers']
     const :sorbet_options, T::Array[String], default: []
 
     class << self

data/lib/sorbet_view/file_system/file_watcher.rb

@@ -22,7 +22,7 @@ module SorbetView
 
       sig { void }
       def start
-        dirs = (@config.input_dirs + @config.component_dirs).select { |d| Dir.exist?(d) }
+        dirs = (@config.input_dirs + @config.component_dirs + @config.controller_dirs).uniq.select { |d| Dir.exist?(d) }
         return if dirs.empty?
 
         @listener = Listen.to(

data/lib/sorbet_view/lsp/server.rb

@@ -156,6 +156,7 @@ module SorbetView
           # Forward .rb files to Sorbet; also recompile if they contain erb_template
           forward_to_sorbet(message)
           compile_component_if_needed(uri, text)
+          recompile_templates_for_controller(uri)
         end
       end
 
@@ -176,6 +177,7 @@ module SorbetView
           changes = params['contentChanges']
           text = changes&.last&.fetch('text', nil)
           compile_component_if_needed(uri, text) if text
+          recompile_templates_for_controller(uri)
         end
       end
 
@@ -202,6 +204,7 @@ module SorbetView
           compile_and_sync(doc) if doc
         else
           compile_component_if_needed(uri, text)
+          recompile_templates_for_controller(uri)
         end
       end
 
@@ -582,6 +585,7 @@ module SorbetView
           if path.end_with?('.rb')
             # Component .rb file — compile and notify Sorbet
             compile_component_if_needed(template_uri, source)
+            recompile_templates_for_controller(template_uri)
           else
             result = @compiler.compile(path, source)
             next if result.source_map.entries.empty? && @config.skip_missing_locals && requires_locals?(path)
@@ -599,6 +603,62 @@ module SorbetView
         @logger.error("FileWatcher callback error: #{e.message}")
       end
 
+      # --- Controller → Template Recompilation ---
+
+      sig { params(uri: String).void }
+      def recompile_templates_for_controller(uri)
+        path = @uri_mapper.uri_to_path(uri)
+        return unless path.end_with?('_controller.rb')
+
+        controller_relative = extract_controller_relative_path(path)
+        return unless controller_relative
+
+        @logger.debug("Controller changed: #{path} → recompiling templates for #{controller_relative}")
+        @compiler.invalidate_ivar_cache!
+
+        @config.input_dirs.each do |input_dir|
+          view_dir = File.join(input_dir, controller_relative)
+          next unless Dir.exist?(view_dir)
+
+          Dir.glob(File.join(view_dir, '**', '*.erb')).each do |template_path|
+            source = File.read(template_path)
+            result = @compiler.compile(template_path, source)
+            @output_manager.write(result)
+            @position_translator.register(template_path, result.source_map)
+            notify_sorbet_template_changed(template_path, result)
+          end
+        end
+      rescue => e
+        @logger.error("recompile_templates_for_controller error: #{e.message}")
+      end
+
+      sig { params(path: String).returns(T.nilable(String)) }
+      def extract_controller_relative_path(path)
+        match = path.match(%r{controllers/(.+)_controller\.rb\z})
+        match ? match[1] : nil
+      end
+
+      sig { params(template_path: String, result: Compiler::CompileResult).void }
+      def notify_sorbet_template_changed(template_path, result)
+        ruby_uri = @uri_mapper.path_to_uri(result.source_map.ruby_path)
+        if @sorbet_open_uris.include?(ruby_uri)
+          @sorbet.send_notification('textDocument/didChange', {
+            'textDocument' => { 'uri' => ruby_uri, 'version' => 0 },
+            'contentChanges' => [{ 'text' => result.ruby_source }]
+          })
+        else
+          @sorbet.send_notification('textDocument/didOpen', {
+            'textDocument' => {
+              'uri' => ruby_uri,
+              'languageId' => 'ruby',
+              'version' => 0,
+              'text' => result.ruby_source
+            }
+          })
+          @sorbet_open_uris.add(ruby_uri)
+        end
+      end
+
       sig { params(message: T::Hash[String, T.untyped]).void }
       def forward_to_sorbet(message)
         @sorbet.forward(message)

data/lib/sorbet_view/version.rb

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

data/sorbet_view.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'listen', '~> 3.0'
   spec.add_dependency 'psych'
   spec.add_dependency 'sorbet-runtime'
-  spec.add_dependency 'srb_lens', '~> 0.3.0'
+  spec.add_dependency 'srb_lens', '~> 0.5.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sorbet_view
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - kazuma
 bindir: exe
 cert_chain: []
-date: 2026-03-12 00:00:00.000000000 Z
+date: 2026-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: herb
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
 description: Extracts Ruby code from view templates (ERB, etc.) for Sorbet type-checking,
   with LSP support
 executables:
@@ -86,6 +86,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - LICENSE
 - README.md
 - Rakefile