tapioca 0.11.17 → 0.13.0

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "kredis"
-rescue LoadError
-  return
-end
+return unless defined?(Kredis::Attributes)
 
 module Tapioca
   module Dsl

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_support/core_ext/class/attribute"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveSupport)
 
 module Tapioca
   module Dsl

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "google/protobuf"
-rescue LoadError
-  return
-end
+return unless defined?(Google::Protobuf)
 
 module Tapioca
   module Dsl
@@ -306,6 +302,13 @@ module Tapioca
             return_type: "void",
           )
 
+          if desc.has_presence?
+            klass.create_method(
+              "has_#{field.name}?",
+              return_type: "Object",
+            )
+          end
+
           field
         end
 

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

@@ -1,12 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "rails/generators"
-  require "rails/generators/app_base"
-rescue LoadError
-  return
-end
+return unless defined?(Rails::Generators::Base)
 
 module Tapioca
   module Dsl

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "sidekiq"
-rescue LoadError
-  return
-end
+return unless defined?(Sidekiq::Worker)
 
 module Tapioca
   module Dsl

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

@@ -1,13 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "smart_properties"
-rescue LoadError
-  # means SmartProperties is not installed,
-  # so let's not even define the compiler.
-  return
-end
+return unless defined?(SmartProperties)
 
 module Tapioca
   module Dsl

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

@@ -1,13 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "state_machines"
-rescue LoadError
-  # means StateMachines is not installed,
-  # so let's not even define the compiler.
-  return
-end
+return unless defined?(StateMachines)
 
 module Tapioca
   module Dsl

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

@@ -1,13 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "rails"
-  require "action_controller"
-  require "action_view"
-rescue LoadError
-  return
-end
+return unless defined?(Rails) && defined?(ActionDispatch::Routing)
 
 module Tapioca
   module Dsl
@@ -102,19 +96,11 @@ module Tapioca
           end
         end
 
-        NON_DISCOVERABLE_INCLUDERS = T.let(
-          [
-            ActionDispatch::IntegrationTest,
-            ActionView::Helpers,
-          ],
-          T::Array[Module],
-        )
-
         class << self
           extend T::Sig
           sig { override.returns(T::Enumerable[Module]) }
           def gather_constants
-            return [] unless Rails.application
+            return [] unless defined?(Rails.application) && 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)
@@ -131,6 +117,19 @@ module Tapioca
             constants.concat(NON_DISCOVERABLE_INCLUDERS)
           end
 
+          sig { returns(T::Array[Module]) }
+          def gather_non_discoverable_includers
+            [].tap do |includers|
+              if defined?(ActionController::TemplateAssertions) && defined?(ActionDispatch::IntegrationTest)
+                includers << ActionDispatch::IntegrationTest
+              end
+
+              if defined?(ActionView::Helpers)
+                includers << ActionView::Helpers
+              end
+            end.freeze
+          end
+
           sig { params(mod: Module, helper: Module).returns(T::Boolean) }
           private def includes_helper?(mod, helper)
             superclass_ancestors = []
@@ -145,6 +144,8 @@ module Tapioca
           end
         end
 
+        NON_DISCOVERABLE_INCLUDERS = T.let(gather_non_discoverable_includers, T::Array[Module])
+
         private
 
         sig { params(root: RBI::Tree, constant: Module).void }

data/lib/tapioca/dsl/extensions/active_record.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 begin
-  require "active_record"
+  require "active_support"
 rescue LoadError
   return
 end
@@ -39,7 +39,9 @@ module Tapioca
             super
           end
 
-          ::ActiveRecord::Base.singleton_class.prepend(self)
+          ::ActiveSupport.on_load(:active_record) do
+            ::ActiveRecord::Base.singleton_class.prepend(::Tapioca::Dsl::Compilers::Extensions::ActiveRecord)
+          end
         end
       end
     end

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

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 begin
-  require "frozen_record"
+  require "active_support"
 rescue LoadError
   return
 end
@@ -21,7 +21,11 @@ module Tapioca
             super
           end
 
-          ::FrozenRecord::Base.singleton_class.prepend(self)
+          ::ActiveSupport.on_load(:before_configuration) do
+            next unless defined?(::FrozenRecord::Base)
+
+            ::FrozenRecord::Base.singleton_class.prepend(::Tapioca::Dsl::Compilers::Extensions::FrozenRecord)
+          end
         end
       end
     end

data/lib/tapioca/dsl/extensions/kredis.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 begin
-  require "kredis"
+  require "active_support"
 rescue LoadError
   return
 end
@@ -106,7 +106,11 @@ module Tapioca
             @__tapioca_kredis_types[method.to_s] = { type: type, values: values }
           end
 
-          ::Kredis::Attributes::ClassMethods.prepend(self)
+          ::ActiveSupport.on_load(:before_configuration) do
+            next unless defined?(::Kredis::Attributes::ClassMethods)
+
+            ::Kredis::Attributes::ClassMethods.prepend(::Tapioca::Dsl::Compilers::Extensions::Kredis)
+          end
         end
       end
     end

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

@@ -0,0 +1,70 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module Dsl
+    module Helpers
+      module ActiveModelTypeHelper
+        class << self
+          extend T::Sig
+
+          # Returns the type indicated by the custom ActiveModel::Type::Value.
+          # Accepts subclasses of ActiveModel::Type::Value as well as classes that implement similar methods.
+          sig { params(type_value: T.untyped).returns(String) }
+          def type_for(type_value)
+            return "T.untyped" if Runtime::GenericTypeRegistry.generic_type_instance?(type_value)
+
+            type = lookup_return_type_of_method(type_value, :deserialize) ||
+              lookup_return_type_of_method(type_value, :cast) ||
+              lookup_return_type_of_method(type_value, :cast_value) ||
+              lookup_arg_type_of_method(type_value, :serialize) ||
+              T.untyped
+            type.to_s
+          end
+
+          private
+
+          MEANINGLESS_TYPES = T.let(
+            [
+              T.untyped,
+              T.noreturn,
+              T::Private::Types::Void,
+              T::Private::Types::NotTyped,
+            ].freeze,
+            T::Array[Object],
+          )
+
+          sig { params(type: T.untyped).returns(T::Boolean) }
+          def meaningful_type?(type)
+            !MEANINGLESS_TYPES.include?(type)
+          end
+
+          sig { params(obj: T.untyped, method: Symbol).returns(T.nilable(T::Types::Base)) }
+          def lookup_return_type_of_method(obj, method)
+            return_type = lookup_signature_of_method(obj, method)&.return_type
+            return unless return_type && meaningful_type?(return_type)
+
+            return_type
+          end
+
+          sig { params(obj: T.untyped, method: Symbol).returns(T.nilable(T::Types::Base)) }
+          def lookup_arg_type_of_method(obj, method)
+            # Arg types is an array of [name, type] entries, so we dig into first entry (index 0)
+            # and then into the type which is the last element (index 1)
+            first_arg_type = lookup_signature_of_method(obj, method)&.arg_types&.dig(0, 1)
+            return unless first_arg_type && meaningful_type?(first_arg_type)
+
+            first_arg_type
+          end
+
+          sig { params(obj: T.untyped, method: Symbol).returns(T.untyped) }
+          def lookup_signature_of_method(obj, method)
+            Runtime::Reflection.signature_of(obj.method(method))
+          rescue NameError
+            nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "tapioca/dsl/helpers/active_model_type_helper"
+
 module Tapioca
   module Dsl
     module Helpers
@@ -98,7 +100,7 @@ module Tapioca
             ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array
             "T::Array[#{type_for_activerecord_value(column_type.subtype)}]"
           else
-            handle_unknown_type(column_type)
+            ActiveModelTypeHelper.type_for(column_type)
           end
         end
 
@@ -108,40 +110,6 @@ module Tapioca
             !(constant.singleton_class < Object.const_get(:StrongTypeGeneration))
         end
 
-        sig { params(column_type: BasicObject).returns(String) }
-        def handle_unknown_type(column_type)
-          return "T.untyped" unless ActiveModel::Type::Value === column_type
-          return "T.untyped" if Runtime::GenericTypeRegistry.generic_type_instance?(column_type)
-
-          lookup_return_type_of_method(column_type, :deserialize) ||
-            lookup_return_type_of_method(column_type, :cast) ||
-            lookup_arg_type_of_method(column_type, :serialize) ||
-            "T.untyped"
-        end
-
-        sig { params(column_type: ActiveModel::Type::Value, method: Symbol).returns(T.nilable(String)) }
-        def lookup_return_type_of_method(column_type, method)
-          signature = Runtime::Reflection.signature_of(column_type.method(method))
-          return unless signature
-
-          return_type = signature.return_type
-          return if return_type == T::Private::Types::Void || return_type == T::Private::Types::NotTyped
-
-          return_type.to_s
-        end
-
-        sig { params(column_type: ActiveModel::Type::Value, method: Symbol).returns(T.nilable(String)) }
-        def lookup_arg_type_of_method(column_type, method)
-          signature = Runtime::Reflection.signature_of(column_type.method(method))
-          return unless signature
-
-          # Arg types is an array [name, type] entries, so we desctructure the type of
-          # first argument to get the first argument type
-          _, first_argument_type = signature.arg_types.first
-
-          first_argument_type.to_s
-        end
-
         sig { params(column_type: ActiveRecord::Enum::EnumType).returns(String) }
         def enum_setter_type(column_type)
           # In Rails < 7 this method is private. When support for that is dropped we can call the method directly

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

@@ -22,8 +22,10 @@ module Tapioca
         CommonRelationMethodsModuleName = T.let("CommonRelationMethods", String)
 
         RelationClassName = T.let("PrivateRelation", String)
+        RelationGroupChainClassName = T.let("PrivateRelationGroupChain", String)
         RelationWhereChainClassName = T.let("PrivateRelationWhereChain", String)
         AssociationRelationClassName = T.let("PrivateAssociationRelation", String)
+        AssociationRelationGroupChainClassName = T.let("PrivateAssociationRelationGroupChain", String)
         AssociationRelationWhereChainClassName = T.let("PrivateAssociationRelationWhereChain", String)
         AssociationsCollectionProxyClassName = T.let("PrivateCollectionProxy", String)
       end

data/lib/tapioca/dsl/pipeline.rb

@@ -61,7 +61,7 @@ module Tapioca
           .sort_by! { |c| T.must(Runtime::Reflection.name_of(c)) }
 
         # It's OK if there are no constants to process if we received a valid file/path.
-        if constants_to_process.empty? && requested_paths.select { |p| File.exist?(p) }.empty?
+        if constants_to_process.empty? && requested_paths.none? { |p| File.exist?(p) }
           report_error(<<~ERROR)
             No classes/modules can be matched for RBI generation.
             Please check that the requested classes/modules include processable DSL methods.

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

@@ -6,6 +6,7 @@ module Tapioca
     module Listeners
       class SorbetProps < Base
         extend T::Sig
+        include RBIHelper
 
         private
 
@@ -17,7 +18,7 @@ module Tapioca
           return unless T::Props::ClassMethods === constant
 
           constant.props.map do |name, prop|
-            type = prop.fetch(:type_object, "T.untyped").to_s.gsub(".returns(<VOID>)", ".void")
+            type = sanitize_signature_types(prop.fetch(:type_object, "T.untyped").to_s)
 
             default = prop.key?(:default) || prop.key?(:factory) ? "T.unsafe(nil)" : nil
             node << if prop.fetch(:immutable, false)

data/lib/tapioca/gemfile.rb

@@ -178,7 +178,18 @@ module Tapioca
 
       sig { void }
       def parse_yard_docs
-        files.each { |path| YARD.parse(path.to_s, [], Logger::Severity::FATAL) }
+        files.each do |path|
+          YARD.parse(path.to_s, [], Logger::Severity::FATAL)
+        rescue RangeError
+          # In some circumstances, YARD will raise an error when parsing a file
+          # that is actually valid Ruby. We don't want tapioca to halt in these
+          # cases, so we'll rescue the error, pretend like there was no
+          # documentation, and move on.
+          #
+          # This can be removed when https://github.com/lsegal/yard/issues/1536
+          # is resolved and released.
+          []
+        end
       end
 
       sig { returns(T::Array[String]) }

data/lib/tapioca/rbi_ext/model.rb

@@ -87,24 +87,56 @@ module RBI
       ).void
     end
     def create_method(name, parameters: [], return_type: "T.untyped", class_method: false, visibility: RBI::Public.new,
+      comments: [])
+      sig = create_sig(parameters: parameters, return_type: return_type)
+      create_method_with_sigs(
+        name,
+        sigs: [sig],
+        parameters: parameters.map(&:param),
+        class_method: class_method,
+        visibility: visibility,
+        comments: comments,
+      )
+    end
+
+    sig do
+      params(
+        name: String,
+        sigs: T::Array[RBI::Sig],
+        parameters: T::Array[RBI::Param],
+        class_method: T::Boolean,
+        visibility: RBI::Visibility,
+        comments: T::Array[RBI::Comment],
+      ).void
+    end
+    def create_method_with_sigs(name, sigs:, parameters: [], class_method: false, visibility: RBI::Public.new,
       comments: [])
       return unless Tapioca::RBIHelper.valid_method_name?(name)
 
-      sig = RBI::Sig.new(return_type: return_type)
       method = RBI::Method.new(
         name,
-        sigs: [sig],
+        sigs: sigs,
+        params: parameters,
         is_singleton: class_method,
         visibility: visibility,
         comments: comments,
       )
-      parameters.each do |param|
-        method << param.param
-        sig << RBI::SigParam.new(param.param.name, param.type)
-      end
       self << method
     end
 
+    sig do
+      params(
+        parameters: T::Array[RBI::TypedParam],
+        return_type: String,
+      ).returns(RBI::Sig)
+    end
+    def create_sig(parameters: [], return_type: "T.untyped")
+      params = parameters.map do |param|
+        RBI::SigParam.new(param.param.name, param.type)
+      end
+      RBI::Sig.new(params: params, return_type: return_type)
+    end
+
     private
 
     sig { returns(T::Hash[String, RBI::Node]) }

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.11.17
+  version: 0.13.0
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,21 +81,18 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.10820
+        version: 0.5.11087
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.10820
+        version: 0.5.11087
 - !ruby/object:Gem::Dependency
   name: spoom
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
@@ -103,9 +100,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
@@ -209,6 +203,7 @@ files:
 - lib/tapioca/dsl/extensions/active_record.rb
 - lib/tapioca/dsl/extensions/frozen_record.rb
 - lib/tapioca/dsl/extensions/kredis.rb
+- lib/tapioca/dsl/helpers/active_model_type_helper.rb
 - lib/tapioca/dsl/helpers/active_record_column_type_helper.rb
 - lib/tapioca/dsl/helpers/active_record_constants_helper.rb
 - lib/tapioca/dsl/helpers/graphql_type_helper.rb
@@ -293,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard