sorbet_erb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066514027114bf88c8a5fe55bf534b6fde19c739faa0ee8a95878a6a337e735c
-  data.tar.gz: b709e8f1e30f9280ce1143fd8348e1099b31b3f2040716557fd177caf6eb8b39
+  metadata.gz: 1243e1d235eda3fa678fb4cc05edf42af42548b453d679058cf3a84ab1bfe405
+  data.tar.gz: cd5c593cb18eef72cbe4a8bf3ba9209b3090b462714187ed1d36fedb7a5e1a59
 SHA512:
-  metadata.gz: 47a69221db20d63363de18294e9132acf72bcef2a5a7fe25070f404a5461dab44f06ab2ada93bb6f6fbe082f80443ea3744404e259ffb2b42057c9a521702597
-  data.tar.gz: 71df4f5bf5bdc9e1c36c04862fad4911e164bb5904d5a449c8669bb9bd76cedc45e876102adcbd121ef6dc79d5b6e4494a70ee47de86c754727d47b885d297d8
+  metadata.gz: 6d4a0d9521a33594a74488a6ae3e1ee62d8f970209f75190cdb67a61a90ddb4010702071c3a81b27e97b4c5f3374c518b3374196d88b65601316477498c97413
+  data.tar.gz: d01ca6fbcbdb67752099e2d9602ee41bedb6fc4ef5322be0d6c66c939bdf27608edb4041f2d0db788c64062d84d2f3a0e23da78aca84b633333f3cad3ca3e8a8

data/.rubocop.yml

@@ -1,9 +1,12 @@
 AllCops:
-  TargetRubyVersion: 3.0.0
+  TargetRubyVersion: 3.1.0
 
 Style/Documentation:
   Enabled: false
 
+Style/HashSyntax:
+  Enabled: false
+
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: single_quotes

data/.ruby-version

@@ -0,0 +1 @@
+3.3.6

data/lib/sorbet_erb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SorbetErb
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/sorbet_erb.rb

@@ -28,7 +28,7 @@ module SorbetErb
 
   ERB_TEMPLATE = <<~ERB_TEMPLATE
     # typed: true
-    class SorbetErb<%= class_suffix %> < ApplicationController
+    class <%= class_name %><%= extend_app_controller ? " < ApplicationController" : "" %>
       extend T::Sig
       include ActionView::Helpers
       include ApplicationController::HelperMethods
@@ -87,6 +87,8 @@ module SorbetErb
       locals ||= '()'
       locals_sig ||= ''
 
+      class_name, extend_app_controller = class_name_from_path(pathname)
+
       rel_output_dir = File.join(
         output_dir,
         pathname.dirname.relative_path_from(d)
@@ -100,7 +102,8 @@ module SorbetErb
       erb = ERB.new(ERB_TEMPLATE)
       File.open(output_path, 'w') do |f|
         result = erb.result_with_hash(
-          class_suffix: SecureRandom.hex(6),
+          class_name: class_name,
+          extend_app_controller: extend_app_controller,
           locals: locals,
           locals_sig: locals_sig,
           extra_includes: config.fetch('extra_includes'),
@@ -127,6 +130,40 @@ module SorbetErb
     file_name.start_with?('_') || file_name.end_with?('.turbo_stream.erb')
   end
 
+  def self.class_name_from_path(pathname)
+    # ViewComponents are stored under app/components, and the partials need access to the instance
+    # methods and variables available on the component class, so set the class name to the component
+    # class name.
+    # TODO: support namespacing
+    if pathname.to_s.start_with?('app/components')
+      return [
+        extract_class_name(pathname).map do |part|
+          ActiveSupport::Inflector.camelize(part)
+        end.join('::'),
+        false
+      ]
+    end
+
+    # Otherwise make a random class so this doesn't collide with any existing code
+    ["SorbetErb#{SecureRandom.hex(6)}", true]
+  end
+
+  def self.extract_class_name(pathname)
+    return [] if pathname.to_s == 'app/components' || pathname.to_s == '.'
+
+    # Strip template suffix
+    basename = File.basename(pathname.basename, '.html.erb')
+
+    # We need to handle the cases where the dirname matches the component name, or if there's
+    # a namespace
+    # `app/components/my_component/my_component.html.erb`
+    # `app/components/namespace/my_component/my_component.html.erb`
+    dirname = pathname.dirname
+    dirname = dirname.dirname if basename.to_s == dirname.basename.to_s
+
+    extract_class_name(dirname) + [basename]
+  end
+
   def self.start(argv)
     input = argv[0]
     output = argv[1]

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

@@ -98,7 +98,7 @@ module Tapioca
         def generate_instance_methods(klass, name, return_type, is_many)
           return_type_maybe_plural =
             if is_many
-              "T::Enumerable[#{return_type}]"
+              "T::Array[#{return_type}]"
             else
               return_type
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet_erb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Franklin Hu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- ".ruby-version"
 - README.md
 - Rakefile
 - exe/sorbet_erb
@@ -76,7 +77,7 @@ metadata:
   homepage_uri: https://github.com/franklinhu/sorbet_erb
   source_code_uri: https://github.com/franklinhu/sorbet_erb
   changelog_uri: https://github.com/franklinhu/sorbet_erb
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -84,15 +85,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Extracts Ruby code from ERB files for Sorbet
 test_files: []