sorbet_view 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c74f0ac2be7deb8aa466c27b4b4558852ebd4de838ada96d434650bb9c5bad0c
-  data.tar.gz: 4d807c4126e1f272397d4cad1b38c2a5f3341616df90aab21b3efb621874e992
+  metadata.gz: 1eb1f1ebb6f7bf77db79673819fc89044d6b998ea2ee1ba069700453d87cc1cd
+  data.tar.gz: 40fefcdbe8af51be0b75f3f3dee6a4f31524439424c90468b80c779422b5054f
 SHA512:
-  metadata.gz: b8a488ac1a4299128cd8ec4df072c4098a8b801bd080f34cf7e29353f47303ef4eb05e22b89ba56b5dae32e1e9f7edb5325333c11e132610aa13d4c882a287e2
-  data.tar.gz: 2d40c0ce178370b135c91e8f49cd4e3f2f7fec3dc114849497afc2af3a8326523df09b1cf0362e512e4fa2d87b808db8b11c24325736dc582348ef9b0e556444
+  metadata.gz: c468a4efb4b9ed4d2965979d326d885e807b11bb4b6386d26ea08f580db59b2638dd34387f0b82e51d071fbecf9b952dd5015c4be1029e8abb6c457144c86111
+  data.tar.gz: f1ec4ae5f31c306ffc1321c7fd56a98c25730858b5fa230bfc4cb63ce221eee4a964f52e01a0e7bf838cd7107dedb6583d7228d4aa7cbb59bc2e3f7863977dcf

data/lib/sorbet_view/lsp/server.rb

@@ -1,6 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
+require 'listen'
 require 'logger'
 require 'set'
 
@@ -44,6 +45,7 @@ module SorbetView
         @logger.error("Server error: #{e.message}\n#{e.backtrace&.join("\n")}")
       ensure
         @file_watcher&.stop
+        @ivar_json_watcher&.stop
         @sorbet.stop
         @logger.info('SorbetView LSP server stopped')
       end
@@ -568,10 +570,46 @@ module SorbetView
         end
         @file_watcher.start
         @logger.info("FileWatcher started for: #{@config.input_dirs.join(', ')}")
+
+        start_ivar_json_watcher
       rescue => e
         @logger.warn("Failed to start FileWatcher: #{e.message}")
       end
 
+      sig { void }
+      def start_ivar_json_watcher
+        json_path = File.join(@config.output_dir, '.defined_ivars.json')
+        dir = File.dirname(json_path)
+        return unless Dir.exist?(dir)
+
+        @ivar_json_watcher = T.let(nil, T.untyped)
+        @ivar_json_watcher = Listen.to(dir, only: /\.defined_ivars\.json$/) do |modified, added, _removed|
+          next if (modified + added).empty?
+
+          @logger.info('.defined_ivars.json changed — recompiling all templates')
+          @compiler.invalidate_ivar_cache!
+          recompile_all_templates
+        end
+        @ivar_json_watcher.start
+        @logger.info("Watching #{json_path} for ivar mapping changes")
+      rescue => e
+        @logger.warn("Failed to start ivar JSON watcher: #{e.message}")
+      end
+
+      sig { void }
+      def recompile_all_templates
+        templates = FileSystem::ProjectScanner.scan(@config)
+        templates.each do |path|
+          source = File.read(path)
+          result = @compiler.compile(path, source)
+          @output_manager.write(result)
+          @position_translator.register(path, result.source_map)
+          notify_sorbet_template_changed(path, result)
+        end
+      rescue => e
+        @logger.error("recompile_all_templates error: #{e.message}")
+      end
+
       sig { params(modified: T::Array[String], added: T::Array[String], removed: T::Array[String]).void }
       def handle_file_changes(modified, added, removed)
         (modified + added).each do |path|

data/lib/sorbet_view/version.rb

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

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

@@ -40,6 +40,7 @@ module Tapioca
 
           generate_ivar_mapping(controllers)
           process_components
+          compile_all_templates
         end
 
         private
@@ -80,17 +81,22 @@ module Tapioca
           mapping_path = File.join(config.output_dir, '.defined_ivars.json')
           FileUtils.mkdir_p(File.dirname(mapping_path))
           File.write(mapping_path, JSON.pretty_generate(mapping))
-        rescue StandardError
-          # Non-critical: if mapping fails, all ivars default to NilClass
+        rescue StandardError => e
+          $stderr.puts "[SorbetView] generate_ivar_mapping failed: #{e.class}: #{e.message}"
+          $stderr.puts e.backtrace&.first(5)&.join("\n")
         end
 
         # Resolve view directories from Rails, relative to project root
+        # Only include directories within the project (exclude gem paths)
         sig { returns(T::Array[String]) }
         def resolve_view_dirs
           if defined?(::ActionController::Base) && ::ActionController::Base.respond_to?(:view_paths)
+            cwd = Dir.pwd
             ::ActionController::Base.view_paths.paths.filter_map do |p|
               path_str = p.to_s
-              relative = path_str.sub(%r{^#{Regexp.escape(Dir.pwd)}/?}, '')
+              next unless path_str.start_with?(cwd)
+
+              relative = path_str.sub(%r{^#{Regexp.escape(cwd)}/?}, '')
               relative unless relative.empty?
             end
           else
@@ -134,11 +140,34 @@ module Tapioca
             next if name.nil? || name.empty?
             next if type.nil? || type.empty?
 
-            result[name] = type
+            result[name] = normalize_type(type)
           end
           result
         end
 
+        # Compile all templates after generating ivar mapping
+        sig { void }
+        def compile_all_templates
+          config = ::SorbetView::Configuration.load
+          compiler = ::SorbetView::Compiler::TemplateCompiler.new(config: config)
+          output_manager = ::SorbetView::FileSystem::OutputManager.new(config.output_dir)
+
+          templates = ::SorbetView::FileSystem::ProjectScanner.scan(config)
+          templates.each do |path|
+            result = compiler.compile_file(path)
+            output_manager.write(result)
+          end
+
+          component_compiler = ::SorbetView::Compiler::ComponentCompiler.new(config: config)
+          components = ::SorbetView::FileSystem::ProjectScanner.scan_components(config)
+          components.each do |path|
+            results = component_compiler.compile_file(path)
+            results.each { |result| output_manager.write(result) }
+          end
+        rescue StandardError => e
+          $stderr.puts "[SorbetView] compile_all_templates failed: #{e.class}: #{e.message}"
+        end
+
         sig { void }
         def process_components
           config = ::SorbetView::Configuration.load
@@ -287,6 +316,13 @@ module Tapioca
           []
         end
 
+        # Normalize Sorbet literal types to their base types
+        # e.g. String("test") → String, Integer(42) → Integer, Symbol(:foo) → Symbol
+        sig { params(type: String).returns(String) }
+        def normalize_type(type)
+          type.gsub(/\b([A-Z]\w*)\(.*?\)/) { $1 }
+        end
+
         sig { params(str: String).returns(String) }
         def camelize(str)
           str.split('_').map(&:capitalize).join

metadata

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