tapioca 0.11.16 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38dec6aff4cfc2907111dda6a6ee1411d5ae7bf58f467a7e8a47094a606f7593
-  data.tar.gz: aa5c4ce427eb9e33513ef4b42f69572030c21be2ea12367abc1755fda0c76202
+  metadata.gz: 0a3ddc2c5d6e123488c0c4f2d0aad9a5de62a8145f2c3eb2d6b73de6f814afc0
+  data.tar.gz: 908740542e026711e9ee85d46ce3828533f965c302039b645213adc016d74258
 SHA512:
-  metadata.gz: 1640eb00441de0826936170a8e40010ab5bf3567329ad64e283d8cad4161a37ff16cf02cea1e41eba50816a6f315af8db69be70b65249b61b015532d86c6da05
-  data.tar.gz: 410060c7ef464f8fe07b28582cef2a86875fa80ff319051aaea31946cd96ad1e40b07c56165421e99b0d300ea19223a3f20756a520a2cb6bd9c76bf16abca230
+  metadata.gz: 0622e47a67918e24c8ec4434892265039b38c0de522b3e2ad1ca156d62b1487317384a7dcc928249c7d5cec62493bee5e36d0cbd2342b97a39011056485d6f30
+  data.tar.gz: 3082afd8096436fee4ecf4cb46b3a4232f77e34fa53bfb60b3182d12a7fcb5b3df58fe8ce67d1c8dcfb9b4a68dd859429bb6f0cf65eb8708991dfb2ff018720b

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

@@ -1,12 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_record"
-  require "aasm"
-rescue LoadError
-  return
-end
+return unless defined?(AASM)
 
 module Tapioca
   module Dsl

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_record"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveRecord::Base)
 
 require "tapioca/dsl/helpers/active_record_constants_helper"
 

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_record"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveRecord::Base)
 
 require "tapioca/dsl/helpers/active_record_column_type_helper"
 require "tapioca/dsl/helpers/active_record_constants_helper"

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_record"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveRecord::Base)
 
 require "tapioca/dsl/helpers/active_record_column_type_helper"
 require "tapioca/dsl/helpers/active_record_constants_helper"

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

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

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

@@ -1,14 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "rails"
-  require "active_record"
-  require "active_record/fixtures"
-  require "active_support/test_case"
-rescue LoadError
-  return
-end
+return unless defined?(Rails) && defined?(ActiveSupport::TestCase) && defined?(ActiveRecord::TestFixtures)
 
 module Tapioca
   module Dsl
@@ -62,7 +55,7 @@ module Tapioca
 
           sig { override.returns(T::Enumerable[Module]) }
           def gather_constants
-            return [] unless Rails.application
+            return [] unless defined?(Rails.application) && Rails.application
 
             [ActiveSupport::TestCase]
           end

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_record"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveRecord::Base)
 
 require "tapioca/dsl/helpers/active_record_constants_helper"
 

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_record"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveRecord::Base)
 
 require "tapioca/dsl/helpers/active_record_constants_helper"
 

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_record"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveRecord::Base)
 
 require "tapioca/dsl/helpers/active_record_constants_helper"
 

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

@@ -1,11 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_record"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveRecord::Base)
 
 require "tapioca/dsl/helpers/active_record_constants_helper"
 

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

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

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

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

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

@@ -1,12 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_storage"
-  require "active_storage/reflection"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveStorage::Reflection::ActiveRecordExtensions::ClassMethods)
 
 module Tapioca
   module Dsl

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

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

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

@@ -1,13 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "active_support"
-  # The following is needed due to https://github.com/rails/rails/pull/41610
-  require "active_support/core_ext/module/delegation"
-rescue LoadError
-  return
-end
+return unless defined?(ActiveSupport::CurrentAttributes)
 
 module Tapioca
   module Dsl
@@ -122,17 +116,13 @@ module Tapioca
 
         sig { params(klass: RBI::Scope, method: String, class_method: T::Boolean).void }
         def generate_method(klass, method, class_method:)
-          if method.end_with?("=")
-            parameter = create_param("value", type: "T.untyped")
-            klass.create_method(
-              method,
-              class_method: class_method,
-              parameters: [parameter],
-              return_type: "T.untyped",
-            )
+          method_def = if class_method
+            constant.method(method)
           else
-            klass.create_method(method, class_method: class_method, return_type: "T.untyped")
+            constant.instance_method(method)
           end
+
+          create_method_from_def(klass, method_def, class_method: class_method)
         end
       end
     end

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

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

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

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

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

@@ -1,12 +1,8 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  gem("graphql", ">= 1.13")
-  require "graphql"
-rescue LoadError
-  return
-end
+return unless defined?(GraphQL::Schema::InputObject)
+return unless Gem::Requirement.new(">= 1.13").satisfied_by?(Gem::Version.new(GraphQL::VERSION))
 
 require "tapioca/dsl/helpers/graphql_type_helper"
 

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

@@ -1,12 +1,8 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  gem("graphql", ">= 1.13")
-  require "graphql"
-rescue LoadError
-  return
-end
+return unless defined?(GraphQL::Schema::InputObject)
+return unless Gem::Requirement.new(">= 1.13").satisfied_by?(Gem::Version.new(GraphQL::VERSION))
 
 require "tapioca/dsl/helpers/graphql_type_helper"
 

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

@@ -1,13 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-begin
-  require "identity_cache"
-rescue LoadError
-  # means IdentityCache is not installed,
-  # so let's not even define the compiler.
-  return
-end
+return unless defined?(ActiveRecord::Base) && defined?(IdentityCache::WithoutPrimaryIndex)
 
 require "tapioca/dsl/helpers/active_record_column_type_helper"
 
@@ -224,7 +218,6 @@ module Tapioca
         def create_aliased_fetch_by_methods(field, klass)
           type, _ = Helpers::ActiveRecordColumnTypeHelper.new(constant).type_for(field.alias_name.to_s)
           multi_type = type.delete_prefix("T.nilable(").delete_suffix(")").delete_prefix("::")
-          length = field.key_fields.length
           suffix = field.send(:fetch_method_suffix)
 
           parameters = field.key_fields.map do |arg|
@@ -238,14 +231,12 @@ module Tapioca
             return_type: type,
           )
 
-          if length == 1
-            klass.create_method(
-              "fetch_multi_#{suffix}",
-              class_method: true,
-              parameters: [create_param("keys", type: "T::Enumerable[T.untyped]")],
-              return_type: COLLECTION_TYPE.call(multi_type),
-            )
-          end
+          klass.create_method(
+            "fetch_multi_#{suffix}",
+            class_method: true,
+            parameters: [create_param("keys", type: "T::Enumerable[T.untyped]")],
+            return_type: COLLECTION_TYPE.call(multi_type),
+          )
         end
       end
     end

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

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

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

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/graphql_type_helper.rb

@@ -26,9 +26,9 @@ module Tapioca
           end
 
           prepare = argument.prepare
-          prepare_method = if prepare
+          prepare_method = if prepare.is_a?(Symbol) || prepare.is_a?(String)
             if constant.respond_to?(prepare)
-              constant.method(prepare)
+              constant.method(prepare.to_sym)
             end
           end
 

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/gem/pipeline.rb

@@ -391,6 +391,7 @@ module Tapioca
       def skip_alias?(name, constant)
         return true if symbol_in_payload?(name)
         return true unless constant_in_gem?(name)
+        return true if has_aliased_namespace?(name)
 
         false
       end

data/lib/tapioca/runtime/reflection.rb

@@ -255,6 +255,23 @@ module Tapioca
       def method_defined_by_forwardable_module?(method)
         method.source_location&.first == Object.const_source_location(:Forwardable)&.first
       end
+
+      sig { params(name: String).returns(T::Boolean) }
+      def has_aliased_namespace?(name)
+        name_parts = name.split("::")
+        name_parts.pop # drop the constant name, leaving just the namespace
+
+        name_parts.each_with_object([]) do |name_part, namespaces|
+          namespaces << "#{namespaces.last}::#{name_part}".delete_prefix("::")
+        end.any? do |namespace|
+          constant = constantize(namespace)
+          next unless Module === constant
+
+          # If the constant name doesn't match the namespace,
+          # the namespace must contain an alias
+          name_of(constant) != namespace
+        end
+      end
     end
   end
 end

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.11.16
+  version: 0.12.0
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.5
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard