tapioca 0.7.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef378ec3f3035d85d6aebfa4624896d216bcccd7d9332cbdc9d64be469b79b48
-  data.tar.gz: 2f34d64fadd075ed1653ec26d27c73a02bfff949440fc6d1fd8bf80116161b48
+  metadata.gz: 1b06e8ec67c72db19639c21a8a123ecbe7c3c58ad27eb8956d6e3772cb68dc1e
+  data.tar.gz: e8c0bb1073cc08c2fc9d7eea7b523ebe1bc87e7f162c0413e2f0f29be67481c4
 SHA512:
-  metadata.gz: 78b6ce07ee08391457763a8e9069b0ff0efaa1be26cdeec7f334d2b45afa6ec12fd152d24c42d4c2b6834db25af77f74d6401bf577fd749ed446ef122dc01161
-  data.tar.gz: 0b1998a9a72153d24747838606ff636cf8718efc67aa98e0c9d3ff01849d677840cd73f0adb8f289cc8c6f7e07b20bd37594bbcd1aea1b91761132fd07a1a9db
+  metadata.gz: fd44669e05b95b61ea62c3c5e7a640bc664a036418d66fad6734065caadaa52ec545408376d4e9ada732d2a976dc599b92fc374ec53ad2a1ffa247adee989acd
+  data.tar.gz: 8f6e3a4223c42f9271321b31c8f26199a9b371865041f3455b3e3350e356adaf0eca2c5d83bcec9e0247f76ed0434c1b93627e19f8c3d10893e084e5c88f7d3e

data/lib/tapioca/commands/todo.rb

@@ -74,10 +74,12 @@ module Tapioca
           .each_line
           .map do |line|
             next if line.include?("<")
-            next if line.include?("class_of")
-            line.strip.gsub("T.untyped::", "")
+
+            line.strip
+              .gsub(/T\.class_of\(([:\w]+)\)/, '\1') # Turn T.class_of(Foo)::Bar into Foo::Bar
           end
           .compact
+          .sort
       end
     end
   end

data/lib/tapioca/dsl/compiler.rb

@@ -17,7 +17,7 @@ module Tapioca
       include Runtime::Reflection
       extend Runtime::Reflection
 
-      ConstantType = type_member(upper: Module)
+      ConstantType = type_member { { upper: Module } }
 
       abstract!
 
@@ -54,7 +54,7 @@ module Tapioca
       sig { returns(T::Set[Module]) }
       def self.processable_constants
         @processable_constants ||= T.let(
-          Set.new(gather_constants).tap(&:compare_by_identity),
+          T::Set[Module].new(gather_constants).compare_by_identity,
           T.nilable(T::Set[Module])
         )
         T.must(@processable_constants)

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

@@ -49,7 +49,7 @@ module Tapioca
             T::Array[String]
           )
 
-        ConstantType = type_member(fixed: T.all(::AASM::ClassMethods, Class))
+        ConstantType = type_member { { fixed: T.all(::AASM::ClassMethods, Class) } }
 
         sig { override.void }
         def decorate

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

@@ -68,7 +68,7 @@ module Tapioca
       class ActionControllerHelpers < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::ActionController::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActionController::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -36,7 +36,7 @@ module Tapioca
       class ActionMailer < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::ActionMailer::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActionMailer::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -40,7 +40,7 @@ module Tapioca
       class ActiveJob < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::ActiveJob::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActiveJob::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -39,7 +39,7 @@ module Tapioca
       class ActiveModelAttributes < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.all(Class, ::ActiveModel::Attributes::ClassMethods))
+        ConstantType = type_member { { fixed: T.all(Class, ::ActiveModel::Attributes::ClassMethods) } }
 
         sig { override.void }
         def decorate

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

@@ -60,7 +60,7 @@ module Tapioca
       class ActiveModelSecurePassword < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.all(Class, ::ActiveModel::SecurePassword::ClassMethods))
+        ConstantType = type_member { { fixed: T.all(Class, ::ActiveModel::SecurePassword::ClassMethods) } }
 
         sig { override.void }
         def decorate

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

@@ -119,7 +119,7 @@ module Tapioca
           end
         end
 
-        ConstantType = type_member(fixed: T.class_of(ActiveRecord::Base))
+        ConstantType = type_member { { fixed: T.class_of(ActiveRecord::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -101,7 +101,7 @@ module Tapioca
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
 
-        ConstantType = type_member(fixed: T.class_of(ActiveRecord::Base))
+        ConstantType = type_member { { fixed: T.class_of(ActiveRecord::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -58,7 +58,7 @@ module Tapioca
       class ActiveRecordEnum < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::ActiveRecord::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -38,7 +38,7 @@ module Tapioca
       class ActiveRecordFixtures < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(ActiveSupport::TestCase))
+        ConstantType = type_member { { fixed: T.class_of(ActiveSupport::TestCase) } }
 
         sig { override.void }
         def decorate
@@ -60,6 +60,8 @@ module Tapioca
 
         sig { override.returns(T::Enumerable[Module]) }
         def self.gather_constants
+          return [] unless Rails.application
+
           [ActiveSupport::TestCase]
         end
 

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

@@ -118,7 +118,7 @@ module Tapioca
       #     sig { returns(T::Array[::Post]) }
       #     def to_ary; end
       #
-      #     Elem = type_member(fixed: ::Post)
+      #     Elem = type_member { { fixed: ::Post } }
       #   end
       #
       #   class PrivateCollectionProxy < ::ActiveRecord::Associations::CollectionProxy
@@ -141,7 +141,7 @@ module Tapioca
       #     sig { returns(T::Array[::Post]) }
       #     def to_ary; end
       #
-      #     Elem = type_member(fixed: ::Post)
+      #     Elem = type_member { { fixed: ::Post } }
       #   end
       # end
       # ~~~
@@ -150,7 +150,7 @@ module Tapioca
         include Helpers::ActiveRecordConstantsHelper
         include SorbetHelper
 
-        ConstantType = type_member(fixed: T.class_of(::ActiveRecord::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
 
         sig { override.void }
         def decorate
@@ -253,7 +253,7 @@ module Tapioca
           model.create_class(RelationClassName, superclass_name: superclass) do |klass|
             klass.create_include(CommonRelationMethodsModuleName)
             klass.create_include(RelationMethodsModuleName)
-            klass.create_constant("Elem", value: "type_member(fixed: #{constant_name})")
+            klass.create_type_variable("Elem", type: "type_member", fixed: constant_name)
 
             klass.create_method("to_ary", return_type: "T::Array[#{constant_name}]")
           end
@@ -269,7 +269,7 @@ module Tapioca
           model.create_class(AssociationRelationClassName, superclass_name: superclass) do |klass|
             klass.create_include(CommonRelationMethodsModuleName)
             klass.create_include(AssociationRelationMethodsModuleName)
-            klass.create_constant("Elem", value: "type_member(fixed: #{constant_name})")
+            klass.create_type_variable("Elem", type: "type_member", fixed: constant_name)
 
             klass.create_method("to_ary", return_type: "T::Array[#{constant_name}]")
           end
@@ -281,7 +281,7 @@ module Tapioca
         def create_relation_where_chain_class(model)
           model.create_class(RelationWhereChainClassName, superclass_name: RelationClassName) do |klass|
             create_where_chain_methods(klass, RelationClassName)
-            klass.create_constant("Elem", value: "type_member(fixed: #{constant_name})")
+            klass.create_type_variable("Elem", type: "type_member", fixed: constant_name)
           end
         end
 
@@ -292,7 +292,7 @@ module Tapioca
             superclass_name: AssociationRelationClassName
           ) do |klass|
             create_where_chain_methods(klass, AssociationRelationClassName)
-            klass.create_constant("Elem", value: "type_member(fixed: #{constant_name})")
+            klass.create_type_variable("Elem", type: "type_member", fixed: constant_name)
           end
         end
 
@@ -329,7 +329,7 @@ module Tapioca
           model.create_class(AssociationsCollectionProxyClassName, superclass_name: superclass) do |klass|
             klass.create_include(CommonRelationMethodsModuleName)
             klass.create_include(AssociationRelationMethodsModuleName)
-            klass.create_constant("Elem", value: "type_member(fixed: #{constant_name})")
+            klass.create_type_variable("Elem", type: "type_member", fixed: constant_name)
 
             klass.create_method("to_ary", return_type: "T::Array[#{constant_name}]")
             create_collection_proxy_methods(klass)

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

@@ -46,7 +46,7 @@ module Tapioca
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
 
-        ConstantType = type_member(fixed: T.class_of(::ActiveRecord::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -90,7 +90,7 @@ module Tapioca
       class ActiveRecordTypedStore < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::ActiveRecord::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -61,7 +61,7 @@ module Tapioca
       class ActiveResource < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::ActiveResource::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActiveResource::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -46,8 +46,12 @@ module Tapioca
       class ActiveStorage < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.all(Module,
-          ::ActiveStorage::Reflection::ActiveRecordExtensions::ClassMethods))
+        ConstantType = type_member do
+          {
+            fixed: T.all(Module,
+              ::ActiveStorage::Reflection::ActiveRecordExtensions::ClassMethods),
+          }
+        end
 
         sig { override.void }
         def decorate

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

@@ -44,7 +44,7 @@ module Tapioca
       class ActiveSupportConcern < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: Module)
+        ConstantType = type_member { { fixed: Module } }
 
         sig { override.void }
         def decorate

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

@@ -62,7 +62,7 @@ module Tapioca
       class ActiveSupportCurrentAttributes < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::ActiveSupport::CurrentAttributes))
+        ConstantType = type_member { { fixed: T.class_of(::ActiveSupport::CurrentAttributes) } }
 
         sig { override.void }
         def decorate

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

@@ -49,7 +49,7 @@ module Tapioca
 
         CONFIG_OPTIONS_SUFFIX = "ConfigOptions"
 
-        ConstantType = type_member(fixed: Module)
+        ConstantType = type_member { { fixed: Module } }
 
         sig { override.void }
         def decorate
@@ -77,7 +77,7 @@ module Tapioca
             # enumerates the entries, we don't make any assumptions about their
             # types.
             mod.create_extend("T::Generic")
-            mod.create_type_member("Elem", value: "type_member(fixed: T.untyped)")
+            mod.create_type_variable("Elem", type: "type_member", fixed: "T.untyped")
 
             method_names.each do |method_name|
               # Create getter method

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

@@ -65,7 +65,7 @@ module Tapioca
       class FrozenRecord < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::FrozenRecord::Base))
+        ConstantType = type_member { { fixed: T.class_of(::FrozenRecord::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -69,7 +69,7 @@ module Tapioca
           T.proc.params(type: T.any(Module, String)).returns(String)
         )
 
-        ConstantType = type_member(fixed: T.class_of(::ActiveRecord::Base))
+        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -51,7 +51,7 @@ module Tapioca
       class MixedInClassAttributes < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: Module)
+        ConstantType = type_member { { fixed: Module } }
 
         sig { override.void }
         def decorate

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

@@ -70,7 +70,9 @@ module Tapioca
 
         extend T::Sig
 
-        ConstantType = type_member(fixed: Module)
+        ConstantType = type_member { { fixed: Module } }
+
+        FIELD_RE = /^[a-z_][a-zA-Z0-9_]*$/
 
         sig { override.void }
         def decorate
@@ -88,7 +90,15 @@ module Tapioca
                 create_kw_opt_param(field.name, type: field.init_type, default: field.default)
               end
 
-              klass.create_method("initialize", parameters: parameters, return_type: "void")
+              if fields.all? { |field| FIELD_RE.match?(field.name) }
+                klass.create_method("initialize", parameters: parameters, return_type: "void")
+              else
+                # One of the fields has an incorrect name for a named parameter so creating the default initialize for
+                # it would create a RBI with a syntax error.
+                # The workaround is to create an initialize that takes a **kwargs instead.
+                kwargs_parameter = create_kw_rest_param("fields", type: "T.untyped")
+                klass.create_method("initialize", parameters: [kwargs_parameter], return_type: "void")
+              end
             end
           end
         end
@@ -107,7 +117,7 @@ module Tapioca
           klass.create_extend("T::Generic")
 
           names.each do |name|
-            klass.create_type_member(name)
+            klass.create_type_variable(name, type: "type_member")
           end
         end
 

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

@@ -46,7 +46,7 @@ module Tapioca
           Regexp
         )
 
-        ConstantType = type_member(fixed: T.class_of(::Rails::Generators::Base))
+        ConstantType = type_member { { fixed: T.class_of(::Rails::Generators::Base) } }
 
         sig { override.void }
         def decorate

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

@@ -43,7 +43,7 @@ module Tapioca
       class SidekiqWorker < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::Sidekiq::Worker))
+        ConstantType = type_member { { fixed: T.class_of(::Sidekiq::Worker) } }
 
         sig { override.void }
         def decorate

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

@@ -63,7 +63,7 @@ module Tapioca
       class SmartProperties < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.class_of(::SmartProperties))
+        ConstantType = type_member { { fixed: T.class_of(::SmartProperties) } }
 
         sig { override.void }
         def decorate

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

@@ -118,7 +118,7 @@ module Tapioca
       class StateMachines < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: T.all(Module, ::StateMachines::ClassMethods))
+        ConstantType = type_member { { fixed: T.all(Module, ::StateMachines::ClassMethods) } }
 
         sig { override.void }
         def decorate

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

@@ -87,7 +87,7 @@ module Tapioca
       class UrlHelpers < Compiler
         extend T::Sig
 
-        ConstantType = type_member(fixed: Module)
+        ConstantType = type_member { { fixed: Module } }
 
         sig { override.void }
         def decorate
@@ -109,6 +109,8 @@ module Tapioca
 
         sig { override.returns(T::Enumerable[Module]) }
         def self.gather_constants
+          return [] unless Rails.application
+
           Object.const_set(:GeneratedUrlHelpersModule, Rails.application.routes.named_routes.url_helpers_module)
           Object.const_set(:GeneratedPathHelpersModule, Rails.application.routes.named_routes.path_helpers_module)
 
@@ -160,7 +162,8 @@ module Tapioca
             superclass_ancestors = ancestors_of(superclass) if superclass
           end
 
-          (ancestors_of(mod) - superclass_ancestors).any? { |ancestor| helper == ancestor }
+          ancestors = Set.new.compare_by_identity.merge(ancestors_of(mod)).subtract(superclass_ancestors)
+          ancestors.any? { |ancestor| helper == ancestor }
         end
       end
     end

data/lib/tapioca/dsl/helpers/param_helper.rb

@@ -1,11 +1,14 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "tapioca/helpers/signatures_helper"
+
 module Tapioca
   module Dsl
     module Helpers
       module ParamHelper
         extend T::Sig
+        include SignaturesHelper
 
         sig { params(name: String, type: String).returns(RBI::TypedParam) }
         def create_param(name, type:)
@@ -44,7 +47,7 @@ module Tapioca
 
         sig { params(param: RBI::Param, type: String).returns(RBI::TypedParam) }
         def create_typed_param(param, type)
-          RBI::TypedParam.new(param: param, type: type)
+          RBI::TypedParam.new(param: param, type: sanitize_signature_types(type))
         end
       end
     end

data/lib/tapioca/dsl/pipeline.rb

@@ -53,7 +53,7 @@ module Tapioca
       end
       def run(&blk)
         constants_to_process = gather_constants(requested_constants)
-          .select { |c| Runtime::Reflection.name_of(c) && Module === c } # Filter anonymous or value constants
+          .select { |c| Module === c } # Filter value constants out
           .sort_by! { |c| T.must(Runtime::Reflection.name_of(c)) }
 
         if constants_to_process.empty?
@@ -112,10 +112,37 @@ module Tapioca
       sig { params(requested_constants: T::Array[Module]).returns(T::Set[Module]) }
       def gather_constants(requested_constants)
         constants = compilers.map(&:processable_constants).reduce(Set.new, :union)
+        constants = filter_anonymous_and_reloaded_constants(constants)
+
         constants &= requested_constants unless requested_constants.empty?
         constants
       end
 
+      sig { params(constants: T::Set[Module]).returns(T::Set[Module]) }
+      def filter_anonymous_and_reloaded_constants(constants)
+        # Group constants by their names
+        constants_by_name = constants
+          .group_by { |c| T.must(Runtime::Reflection.name_of(c)) }
+          .select { |name, _| !name.nil? }
+
+        # Find the constants that have been reloaded
+        reloaded_constants = constants_by_name.select { |_, constants| constants.size > 1 }.keys
+
+        unless reloaded_constants.empty?
+          reloaded_constant_names = reloaded_constants.map { |name| "`#{name}`" }.join(", ")
+
+          $stderr.puts("WARNING: Multiple constants with the same name: #{reloaded_constant_names}")
+          $stderr.puts("Make sure some object is not holding onto these constants during an app reload.")
+        end
+
+        # Look up all the constants back from their names. The resulting constant set will be the
+        # set of constants that are actually in memory with those names.
+        constants_by_name
+          .keys
+          .map { |name| T.cast(Runtime::Reflection.constantize(name), Module) }
+          .to_set
+      end
+
       sig { params(constant: Module).returns(T.nilable(RBI::File)) }
       def rbi_for_constant(constant)
         file = RBI::File.new(strictness: "true")

data/lib/tapioca/gem/listeners/sorbet_signatures.rb

@@ -8,7 +8,7 @@ module Tapioca
         extend T::Sig
 
         include Runtime::Reflection
-        include RBIHelper
+        include SignaturesHelper
 
         TYPE_PARAMETER_MATCHER = /T\.type_parameter\(:?([[:word:]]+)\)/
 

data/lib/tapioca/gem/pipeline.rb

@@ -8,7 +8,7 @@ module Tapioca
     class Pipeline
       extend T::Sig
       include Runtime::Reflection
-      include RBIHelper
+      include SignaturesHelper
 
       IGNORED_SYMBOLS = T.let(["YAML", "MiniTest", "Mutex"], T::Array[String])
 

data/lib/tapioca/helpers/{rbi_helper.rb → signatures_helper.rb}

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Tapioca
-  module RBIHelper
+  module SignaturesHelper
     extend T::Sig
 
     sig { params(sig_string: String).returns(String) }

data/lib/tapioca/helpers/sorbet_helper.rb

@@ -21,8 +21,8 @@ module Tapioca
     SORBET_EXE_PATH_ENV_VAR = "TAPIOCA_SORBET_EXE"
 
     FEATURE_REQUIREMENTS = T.let({
-      # First tag that includes https://github.com/sorbet/sorbet/pull/4706
-      to_ary_nil_support: ::Gem::Requirement.new(">= 0.5.9220"),
+      to_ary_nil_support: ::Gem::Requirement.new(">= 0.5.9220"),         # https://github.com/sorbet/sorbet/pull/4706
+      type_variable_block_syntax: ::Gem::Requirement.new(">= 0.5.9892"), # https://github.com/sorbet/sorbet/pull/5639
     }.freeze, T::Hash[Symbol, ::Gem::Requirement])
 
     class CmdResult < T::Struct

data/lib/tapioca/helpers/type_variable_helper.rb

@@ -0,0 +1,43 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module TypeVariableHelper
+    extend T::Sig
+    extend SorbetHelper
+
+    sig do
+      params(
+        type: String,
+        variance: Symbol,
+        fixed: T.nilable(String),
+        upper: T.nilable(String),
+        lower: T.nilable(String)
+      ).returns(String)
+    end
+    def self.serialize_type_variable(type, variance, fixed, upper, lower)
+      variance = nil if variance == :invariant
+
+      bounds = []
+      bounds << "fixed: #{fixed}" if fixed
+      bounds << "lower: #{lower}" if lower
+      bounds << "upper: #{upper}" if upper
+
+      parameters = []
+      block = []
+
+      parameters << ":#{variance}" if variance
+
+      if sorbet_supports?(:type_variable_block_syntax)
+        block = bounds
+      else
+        parameters.concat(bounds)
+      end
+
+      serialized = type.dup
+      serialized << "(#{parameters.join(", ")})" unless parameters.empty?
+      serialized << " { { #{block.join(", ")} } }" unless block.empty?
+      serialized
+    end
+  end
+end

data/lib/tapioca/internal.rb

@@ -6,14 +6,15 @@ require "tapioca/runtime/reflection"
 require "tapioca/runtime/trackers"
 require "tapioca/runtime/dynamic_mixin_compiler"
 require "tapioca/runtime/loader"
+require "tapioca/helpers/sorbet_helper"
+require "tapioca/helpers/type_variable_helper"
 require "tapioca/sorbet_ext/generic_name_patch"
 require "tapioca/sorbet_ext/fixed_hash_patch"
 require "tapioca/runtime/generic_type_registry"
 require "tapioca/helpers/cli_helper"
 require "tapioca/helpers/config_helper"
-require "tapioca/helpers/rbi_helper"
+require "tapioca/helpers/signatures_helper"
 require "tapioca/helpers/shims_helper"
-require "tapioca/helpers/sorbet_helper"
 require "tapioca/commands"
 require "tapioca/cli"
 require "tapioca/gemfile"

data/lib/tapioca/rbi_ext/model.rb

@@ -61,8 +61,18 @@ module RBI
       create_node(RBI::MixesInClassMethods.new(name))
     end
 
-    sig { params(name: String, value: String).void }
-    def create_type_member(name, value: "type_member")
+    sig do
+      params(
+        name: String,
+        type: String,
+        variance: Symbol,
+        fixed: T.nilable(String),
+        upper: T.nilable(String),
+        lower: T.nilable(String)
+      ).void
+    end
+    def create_type_variable(name, type:, variance: :invariant, fixed: nil, upper: nil, lower: nil)
+      value = Tapioca::TypeVariableHelper.serialize_type_variable(type, variance, fixed, upper, lower)
       create_node(RBI::TypeMember.new(name, value))
     end
 

data/lib/tapioca/runtime/generic_type_registry.rb

@@ -111,8 +111,10 @@ module Tapioca
             constant.clone
           end
 
-          # Let's set the `name` method to return the proper generic name
-          generic_type.define_singleton_method(:name) { name }
+          # Let's set the `name` and `to_s` methods to return the proper generic name
+          name_proc = -> { name }
+          generic_type.define_singleton_method(:name, name_proc)
+          generic_type.define_singleton_method(:to_s, name_proc)
 
           # We need to define a `<=` method on the cloned constant, so that Sorbet
           # can do covariance/contravariance checks on the type variables.

data/lib/tapioca/runtime/reflection.rb

@@ -140,7 +140,11 @@ module Tapioca
       #
       #   class D < C; end
       #   descendants_of(C) # => [B, A, D]
-      sig { type_parameters(:U).params(klass: T.type_parameter(:U)).returns(T::Array[T.type_parameter(:U)]) }
+      sig do
+        type_parameters(:U)
+          .params(klass: T.all(Class, T.type_parameter(:U)))
+          .returns(T::Array[T.type_parameter(:U)])
+      end
       def descendants_of(klass)
         result = ObjectSpace.each_object(klass.singleton_class).reject do |k|
           T.cast(k, Module).singleton_class? || T.unsafe(k) == klass

data/lib/tapioca/sorbet_ext/generic_name_patch.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "tapioca/sorbet_ext/name_patch"
+require "tapioca/helpers/sorbet_helper"
 
 module T
   module Generic
@@ -20,7 +21,7 @@ module T
         Tapioca::Runtime::GenericTypeRegistry.register_type(constant, types)
       end
 
-      def type_member(variance = :invariant, fixed: nil, lower: T.untyped, upper: BasicObject)
+      def type_member(variance = :invariant, fixed: nil, lower: nil, upper: nil, &bounds_proc)
         # `T::Generic#type_member` just instantiates a `T::Type::TypeMember` instance and returns it.
         # We use that when registering the type member and then later return it from this method.
         Tapioca::TypeVariableModule.new(
@@ -29,13 +30,14 @@ module T
           variance,
           fixed,
           lower,
-          upper
+          upper,
+          bounds_proc
         ).tap do |type_variable|
           Tapioca::Runtime::GenericTypeRegistry.register_type_variable(self, type_variable)
         end
       end
 
-      def type_template(variance = :invariant, fixed: nil, lower: T.untyped, upper: BasicObject)
+      def type_template(variance = :invariant, fixed: nil, lower: nil, upper: nil, &bounds_proc)
         # `T::Generic#type_template` just instantiates a `T::Type::TypeTemplate` instance and returns it.
         # We use that when registering the type template and then later return it from this method.
         Tapioca::TypeVariableModule.new(
@@ -44,7 +46,8 @@ module T
           variance,
           fixed,
           lower,
-          upper
+          upper,
+          bounds_proc
         ).tap do |type_variable|
           Tapioca::Runtime::GenericTypeRegistry.register_type_variable(self, type_variable)
         end
@@ -119,18 +122,31 @@ module Tapioca
       end
     end
 
+    # rubocop:disable Metrics/ParameterLists
     sig do
-      params(context: Module, type: Type, variance: Symbol, fixed: T.untyped, lower: T.untyped, upper: T.untyped).void
+      params(
+        context: Module,
+        type: Type,
+        variance: Symbol,
+        fixed: T.untyped,
+        lower: T.untyped,
+        upper: T.untyped,
+        bounds_proc: T.nilable(T.proc.returns(T::Hash[Symbol, T.untyped]))
+      ).void
     end
-    def initialize(context, type, variance, fixed, lower, upper) # rubocop:disable Metrics/ParameterLists
+    def initialize(context, type, variance, fixed, lower, upper, bounds_proc)
       @context = context
       @type = type
       @variance = variance
-      @fixed = fixed
-      @lower = lower
-      @upper = upper
+      @bounds_proc = if bounds_proc
+        bounds_proc
+      else
+        build_bounds_proc(fixed, lower, upper)
+      end
+
       super()
     end
+    # rubocop:enable Metrics/ParameterLists
 
     sig { returns(T.nilable(String)) }
     def name
@@ -153,17 +169,18 @@ module Tapioca
 
     sig { returns(String) }
     def serialize
-      parts = []
-      parts << ":#{@variance}" unless @variance == :invariant
-      parts << "fixed: #{@fixed}" if @fixed
-      parts << "lower: #{@lower}" unless @lower == T.untyped
-      parts << "upper: #{@upper}" unless @upper == BasicObject
-
-      parameters = parts.join(", ")
-
-      serialized = @type.serialize.dup
-      serialized << "(#{parameters})" unless parameters.empty?
-      serialized
+      bounds = @bounds_proc.call
+      fixed = bounds[:fixed].to_s if bounds.key?(:fixed)
+      lower = bounds[:lower].to_s if bounds.key?(:lower)
+      upper = bounds[:upper].to_s if bounds.key?(:upper)
+
+      TypeVariableHelper.serialize_type_variable(
+        @type.serialize,
+        @variance,
+        fixed,
+        upper,
+        lower
+      )
     end
 
     sig { returns(Tapioca::TypeVariable) }
@@ -173,6 +190,19 @@ module Tapioca
 
     private
 
+    sig do
+      params(fixed: T.untyped, lower: T.untyped, upper: T.untyped)
+        .returns(T.proc.returns(T::Hash[Symbol, T.untyped]))
+    end
+    def build_bounds_proc(fixed, lower, upper)
+      bounds = {}
+      bounds[:fixed] = fixed unless fixed.nil?
+      bounds[:lower] = lower unless lower.nil?
+      bounds[:upper] = upper unless upper.nil?
+
+      -> { bounds }
+    end
+
     sig do
       type_parameters(:Result)
         .params(block: T.proc.returns(T.type_parameter(:Result)))

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.7.0"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.3
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,7 +50,7 @@ dependencies:
         version: 0.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: 0.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
         version: 1.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
         version: 1.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.11
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -212,13 +212,14 @@ files:
 - lib/tapioca/gemfile.rb
 - lib/tapioca/helpers/cli_helper.rb
 - lib/tapioca/helpers/config_helper.rb
-- lib/tapioca/helpers/rbi_helper.rb
 - lib/tapioca/helpers/shims_helper.rb
+- lib/tapioca/helpers/signatures_helper.rb
 - lib/tapioca/helpers/sorbet_helper.rb
 - lib/tapioca/helpers/test/content.rb
 - lib/tapioca/helpers/test/dsl_compiler.rb
 - lib/tapioca/helpers/test/isolation.rb
 - lib/tapioca/helpers/test/template.rb
+- lib/tapioca/helpers/type_variable_helper.rb
 - lib/tapioca/internal.rb
 - lib/tapioca/rbi_ext/model.rb
 - lib/tapioca/rbi_formatter.rb