tapioca 0.11.12 → 0.11.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9bce9a6dcef31e80f1933bbc3528bf2d8c1328ec4c129b3d9609c8c053e095f
-  data.tar.gz: af1d5587e075471824d7c29fc5f90cae50ed1e401a21549fa8a2a2c6e390c158
+  metadata.gz: 52388d4c8afe40a2b6807e54bf1dd09701cb016ca1fed7ce5d3a691c3f93e0e5
+  data.tar.gz: 18550aa93626f63257b387154585dc2ae9e74c5aa17c7d4e2b82702bf5ce5b2b
 SHA512:
-  metadata.gz: e25d29263e331bc34f67f46a9dd09629ab9cba280db30fe9c8e15679325162583908760b5e163dae09c269edad870c76916dd3195dbc066186c1952cf346acc2
-  data.tar.gz: 5add77a326f6a60a3f4b8c435b9b0d38e90d117e888aedcc1d48a15bded3c0d7c556a7d6c187020ac35e44709580e7bd9b53813e86cc78259ac9ca5c666561bc
+  metadata.gz: c0be5c5d8108519bbda67d2498ff032273ad855a45c464a5a0acf0780412e7f4d3ee706322ef287fd2882ee0083f3c3fe1ab67611a16a6f45f5aa5a7aeb1a709
+  data.tar.gz: 6a87ab2319905c976cfb0b6a004c12d613a9200269268c6c452f8f7ba9175a1b7fd29c5d32de945a04614aff1de037463ad3c0fd090f883770a7f72d7f2f1476

data/README.md

@@ -86,6 +86,7 @@ Options:
   -c, [--config=<config file path>]  # Path to the Tapioca configuration file
                                      # Default: sorbet/tapioca/config.yml
   -V, [--verbose], [--no-verbose]    # Verbose output for debugging purposes
+                                     # Default: false
 
 ```
 <!-- END_HELP -->
@@ -119,6 +120,7 @@ Options:
   -c, [--config=<config file path>]  # Path to the Tapioca configuration file
                                      # Default: sorbet/tapioca/config.yml
   -V, [--verbose], [--no-verbose]    # Verbose output for debugging purposes
+                                     # Default: false
 
 Get project ready for type checking
 ```
@@ -167,14 +169,17 @@ Options:
                [--file-header], [--no-file-header]                    # Add a "This file is generated" header on top of each generated RBI file
                                                                       # Default: true
                [--all], [--no-all]                                    # Regenerate RBI files for all gems
+                                                                      # Default: false
   --pre, -b,   [--prerequire=file]                                    # A file to be required before Bundler.require is called
   --post, -a,  [--postrequire=file]                                   # A file to be required after Bundler.require is called
                                                                       # Default: sorbet/tapioca/require.rb
   -x,          [--exclude=gem [gem ...]]                              # Exclude the given gem(s) from RBI generation
                [--include-dependencies], [--no-include-dependencies]  # Generate RBI files for dependencies of the given gem(s)
+                                                                      # Default: false
   --typed, -t, [--typed-overrides=gem:level [gem:level ...]]          # Override for typed sigils for generated gem RBIs
                                                                       # Default: {"activesupport"=>"false"}
                [--verify], [--no-verify]                              # Verify RBIs are up-to-date
+                                                                      # Default: false
                [--doc], [--no-doc]                                    # Include YARD documentation from sources when generating RBIs. Warning: this might be slow
                                                                       # Default: true
                [--loc], [--no-loc]                                    # Include comments with source location when generating RBIs
@@ -195,6 +200,7 @@ Options:
   -c,          [--config=<config file path>]                          # Path to the Tapioca configuration file
                                                                       # Default: sorbet/tapioca/config.yml
   -V,          [--verbose], [--no-verbose]                            # Verbose output for debugging purposes
+                                                                      # Default: false
 
 Generate RBIs from gems
 ```
@@ -350,7 +356,7 @@ Usage:
 
 Options:
                [--sources=one two three]                      # URIs of the sources to pull gem RBI annotations from
-                                                              # Default: ["https://raw.githubusercontent.com/Shopify/rbi-central/main"]
+                                                              # Default: "https://raw.githubusercontent.com/Shopify/rbi-central/main"
                [--netrc], [--no-netrc]                        # Use .netrc to authenticate to private sources
                                                               # Default: true
                [--netrc-file=NETRC_FILE]                      # Path to .netrc file
@@ -359,6 +365,7 @@ Options:
   -c,          [--config=<config file path>]                  # Path to the Tapioca configuration file
                                                               # Default: sorbet/tapioca/config.yml
   -V,          [--verbose], [--no-verbose]                    # Verbose output for debugging purposes
+                                                              # Default: false
 
 Pull gem RBI annotations from remote sources
 ```
@@ -467,7 +474,9 @@ Options:
              [--only=compiler [compiler ...]]                       # Only run supplied DSL compiler(s)
              [--exclude=compiler [compiler ...]]                    # Exclude supplied DSL compiler(s)
              [--verify], [--no-verify]                              # Verifies RBIs are up-to-date
+                                                                    # Default: false
   -q,        [--quiet], [--no-quiet]                                # Suppresses file creation output
+                                                                    # Default: false
   -w,        [--workers=N]                                          # Number of parallel workers to use when generating RBIs (default: 2)
                                                                     # Default: 2
              [--rbi-max-line-length=N]                              # Set the max line length of generated RBIs. Signatures longer than the max line length will be wrapped
@@ -475,6 +484,7 @@ Options:
   -e,        [--environment=ENVIRONMENT]                            # The Rack/Rails environment to use when generating RBIs
                                                                     # Default: development
   -l,        [--list-compilers], [--no-list-compilers]              # List all loaded compilers
+                                                                    # Default: false
              [--app-root=APP_ROOT]                                  # The path to the Rails application
                                                                     # Default: .
              [--halt-upon-load-error], [--no-halt-upon-load-error]  # Halt upon a load error while loading the Rails application
@@ -482,6 +492,7 @@ Options:
   -c,        [--config=<config file path>]                          # Path to the Tapioca configuration file
                                                                     # Default: sorbet/tapioca/config.yml
   -V,        [--verbose], [--no-verbose]                            # Verbose output for debugging purposes
+                                                                    # Default: false
 
 Generate RBIs for dynamic methods
 ```
@@ -845,6 +856,7 @@ Options:
   -c, [--config=<config file path>]                # Path to the Tapioca configuration file
                                                    # Default: sorbet/tapioca/config.yml
   -V, [--verbose], [--no-verbose]                  # Verbose output for debugging purposes
+                                                   # Default: false
 
 Check duplicated definitions in shim RBIs
 ```

data/lib/tapioca/dsl/compiler.rb

@@ -36,7 +36,7 @@ module Tapioca
         sig { returns(T::Set[Module]) }
         def processable_constants
           @processable_constants ||= T.let(
-            T::Set[Module].new(gather_constants).compare_by_identity,
+            T::Set[Module].new.compare_by_identity.merge(gather_constants),
             T.nilable(T::Set[Module]),
           )
         end

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

@@ -30,8 +30,13 @@ module Tapioca
       # # notify_user_job.rbi
       # # typed: true
       # class NotifyUserJob
-      #   sig { params(user: User).returns(T.any(NotifyUserJob, FalseClass)) }
-      #   def self.perform_later(user); end
+      #   sig do
+      #     params(
+      #       user: User,
+      #       block: T.nilable(T.proc.params(job: NotifyUserJob).void),
+      #     ).returns(T.any(NotifyUserJob, FalseClass))
+      #   end
+      #   def self.perform_later(user, &block); end
       #
       #   sig { params(user: User).returns(Mail) }
       #   def self.perform_now(user); end
@@ -48,13 +53,14 @@ module Tapioca
 
           root.create_path(constant) do |job|
             method = constant.instance_method(:perform)
+            constant_name = name_of(constant)
             parameters = compile_method_parameters_to_rbi(method)
             return_type = compile_method_return_type_to_rbi(method)
 
             job.create_method(
               "perform_later",
-              parameters: parameters,
-              return_type: "T.any(#{name_of(constant)}, FalseClass)",
+              parameters: perform_later_parameters(parameters, constant_name),
+              return_type: "T.any(#{constant_name}, FalseClass)",
               class_method: true,
             )
 
@@ -67,6 +73,25 @@ module Tapioca
           end
         end
 
+        private
+
+        sig do
+          params(
+            parameters: T::Array[RBI::TypedParam],
+            constant_name: T.nilable(String),
+          ).returns(T::Array[RBI::TypedParam])
+        end
+        def perform_later_parameters(parameters, constant_name)
+          if ::Gem::Requirement.new(">= 7.0").satisfied_by?(::ActiveJob.gem_version)
+            parameters + [create_block_param(
+              "block",
+              type: "T.nilable(T.proc.params(job: #{constant_name}).void)",
+            )]
+          else
+            parameters
+          end
+        end
+
         class << self
           extend T::Sig
 

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

@@ -76,7 +76,12 @@ module Tapioca
             Class.new do
               T.unsafe(self).include(ActiveRecord::TestFixtures)
 
-              T.unsafe(self).fixture_path = Rails.root.join("test", "fixtures")
+              if respond_to?(:fixture_paths=)
+                T.unsafe(self).fixture_paths = [Rails.root.join("test", "fixtures")]
+              else
+                T.unsafe(self).fixture_path = Rails.root.join("test", "fixtures")
+              end
+
               # https://github.com/rails/rails/blob/7c70791470fc517deb7c640bead9f1b47efb5539/activerecord/lib/active_record/test_fixtures.rb#L46
               singleton_class.define_method(:file_fixture_path) do
                 Rails.root.join("test", "fixtures", "files")

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

@@ -126,6 +126,9 @@ module Tapioca
       #     include GeneratedAssociationRelationMethods
       #
       #     sig { returns(T::Array[::Post]) }
+      #     def to_a; end
+      #
+      #     sig { returns(T::Array[::Post]) }
       #     def to_ary; end
       #
       #     Elem = type_member { { fixed: ::Post } }
@@ -149,6 +152,9 @@ module Tapioca
       #     include GeneratedRelationMethods
       #
       #     sig { returns(T::Array[::Post]) }
+      #     def to_a; end
+      #
+      #     sig { returns(T::Array[::Post]) }
       #     def to_ary; end
       #
       #     Elem = type_member { { fixed: ::Post } }
@@ -226,6 +232,7 @@ module Tapioca
           T::Array[Symbol],
         )
         BUILDER_METHODS = T.let([:new, :build, :create, :create!], T::Array[Symbol])
+        TO_ARRAY_METHODS = T.let([:to_ary, :to_a], T::Array[Symbol])
 
         private
 
@@ -296,7 +303,9 @@ module Tapioca
             klass.create_include(RelationMethodsModuleName)
             klass.create_type_variable("Elem", type: "type_member", fixed: constant_name)
 
-            klass.create_method("to_ary", return_type: "T::Array[#{constant_name}]")
+            TO_ARRAY_METHODS.each do |method_name|
+              klass.create_method(method_name.to_s, return_type: "T::Array[#{constant_name}]")
+            end
           end
 
           create_relation_where_chain_class
@@ -312,7 +321,9 @@ module Tapioca
             klass.create_include(AssociationRelationMethodsModuleName)
             klass.create_type_variable("Elem", type: "type_member", fixed: constant_name)
 
-            klass.create_method("to_ary", return_type: "T::Array[#{constant_name}]")
+            TO_ARRAY_METHODS.each do |method_name|
+              klass.create_method(method_name.to_s, return_type: "T::Array[#{constant_name}]")
+            end
           end
 
           create_association_relation_where_chain_class
@@ -372,7 +383,9 @@ module Tapioca
             klass.create_include(AssociationRelationMethodsModuleName)
             klass.create_type_variable("Elem", type: "type_member", fixed: constant_name)
 
-            klass.create_method("to_ary", return_type: "T::Array[#{constant_name}]")
+            TO_ARRAY_METHODS.each do |method_name|
+              klass.create_method(method_name.to_s, return_type: "T::Array[#{constant_name}]")
+            end
             create_collection_proxy_methods(klass)
           end
         end

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

@@ -40,23 +40,29 @@ module Tapioca
       # # typed: true
       #
       # class Current
-      #   sig { returns(T.untyped) }
-      #   def self.account; end
+      #   include GeneratedAttributeMethods
       #
-      #   sig { returns(T.untyped) }
-      #   def account; end
+      #   class << self
+      #     sig { returns(T.untyped) }
+      #     def account; end
       #
-      #   sig { params(account: T.untyped).returns(T.untyped) }
-      #   def self.account=(account); end
+      #     sig { params(account: T.untyped).returns(T.untyped) }
+      #     def account=(account); end
       #
-      #   sig { params(account: T.untyped).returns(T.untyped) }
-      #   def account=(account); end
+      #     sig { params(user_id: Integer).void }
+      #     def authenticate(user_id); end
       #
-      #   sig { params(user_id: Integer).void }
-      #   def self.authenticate(user_id); end
+      #     sig { returns(T.untyped) }
+      #     def helper; end
+      #   end
+      #
+      #   module GeneratedAttributeMethods
+      #     sig { returns(T.untyped) }
+      #     def account; end
       #
-      #   sig { returns(T.untyped) }
-      #   def self.helper; end
+      #     sig { params(account: T.untyped).returns(T.untyped) }
+      #     def account=(account); end
+      #   end
       # end
       # ~~~
       class ActiveSupportCurrentAttributes < Compiler
@@ -71,20 +77,25 @@ module Tapioca
           return if dynamic_methods.empty? && instance_methods.empty?
 
           root.create_path(constant) do |current_attributes|
-            dynamic_methods.each do |method|
-              method = method.to_s
-              # We want to generate each method both on the class
-              generate_method(current_attributes, method, class_method: true)
-              # and on the instance
-              generate_method(current_attributes, method, class_method: false)
-            end
+            current_attributes_methods_name = "GeneratedAttributeMethods"
+            current_attributes.create_module(current_attributes_methods_name) do |generated_attribute_methods|
+              dynamic_methods.each do |method|
+                method = method.to_s
+                # We want to generate each method both on the class
+                generate_method(current_attributes, method, class_method: true)
+                # and on the instance
+                generate_method(generated_attribute_methods, method, class_method: false)
+              end
 
-            instance_methods.each do |method|
-              # instance methods are only elevated to class methods
-              # no need to add separate instance methods for them
-              method = constant.instance_method(method)
-              create_method_from_def(current_attributes, method, class_method: true)
+              instance_methods.each do |method|
+                # instance methods are only elevated to class methods
+                # no need to add separate instance methods for them
+                method = constant.instance_method(method)
+                create_method_from_def(current_attributes, method, class_method: true)
+              end
             end
+
+            current_attributes.create_include(current_attributes_methods_name)
           end
         end
 

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

@@ -55,7 +55,7 @@ module Tapioca
           root.create_path(constant) do |input_object|
             arguments.each do |argument|
               name = argument.keyword.to_s
-              input_object.create_method(name, return_type: Helpers::GraphqlTypeHelper.type_for(argument))
+              input_object.create_method(name, return_type: Helpers::GraphqlTypeHelper.type_for(argument, constant))
             end
           end
         end

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

@@ -59,7 +59,7 @@ module Tapioca
           params = compile_method_parameters_to_rbi(method_def).map do |param|
             name = param.param.name
             argument = arguments_by_name.fetch(name, nil)
-            create_typed_param(param.param, argument_type(argument))
+            create_typed_param(param.param, argument_type(argument, constant))
           end
 
           root.create_path(constant) do |mutation|
@@ -67,11 +67,16 @@ module Tapioca
           end
         end
 
-        sig { params(argument: T.nilable(GraphQL::Schema::Argument)).returns(String) }
-        def argument_type(argument)
+        sig do
+          params(
+            argument: T.nilable(GraphQL::Schema::Argument),
+            constant: T.class_of(GraphQL::Schema::Mutation),
+          ).returns(String)
+        end
+        def argument_type(argument, constant)
           return "T.untyped" unless argument
 
-          Helpers::GraphqlTypeHelper.type_for(argument)
+          Helpers::GraphqlTypeHelper.type_for(argument, constant)
         end
 
         class << self

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

@@ -9,8 +9,13 @@ module Tapioca
 
         extend T::Sig
 
-        sig { params(argument: GraphQL::Schema::Argument).returns(String) }
-        def type_for(argument)
+        sig do
+          params(
+            argument: GraphQL::Schema::Argument,
+            constant: T.any(T.class_of(GraphQL::Schema::Mutation), T.class_of(GraphQL::Schema::InputObject)),
+          ).returns(String)
+        end
+        def type_for(argument, constant)
           type = if argument.loads
             loads_type = ::GraphQL::Schema::Wrapper.new(argument.loads)
             loads_type = loads_type.to_list_type if argument.type.list?
@@ -19,6 +24,7 @@ module Tapioca
           else
             argument.type
           end
+
           unwrapped_type = type.unwrap
 
           parsed_type = case unwrapped_type
@@ -50,11 +56,7 @@ module Tapioca
             signature = Runtime::Reflection.signature_of(method)
             return_type = signature&.return_type
 
-            if return_type && !(T::Private::Types::Void === return_type || T::Private::Types::NotTyped === return_type)
-              return_type.to_s
-            else
-              "T.untyped"
-            end
+            valid_return_type?(return_type) ? return_type.to_s : "T.untyped"
           when GraphQL::Schema::InputObject.singleton_class
             type_for_constant(unwrapped_type)
           when Module
@@ -63,6 +65,17 @@ module Tapioca
             "T.untyped"
           end
 
+          if argument.prepare.is_a?(Symbol) || argument.prepare.is_a?(String)
+            if constant.respond_to?(argument.prepare)
+              prepare_method = constant.method(argument.prepare)
+              prepare_signature = Runtime::Reflection.signature_of(prepare_method)
+
+              if valid_return_type?(prepare_signature&.return_type)
+                parsed_type = prepare_signature.return_type&.to_s
+              end
+            end
+          end
+
           if type.list?
             parsed_type = "T::Array[#{parsed_type}]"
           end
@@ -78,6 +91,14 @@ module Tapioca
 
         sig { params(constant: Module).returns(String) }
         def type_for_constant(constant)
+          if constant.instance_methods.include?(:prepare)
+            prepare_method = constant.instance_method(:prepare)
+
+            prepare_signature = Runtime::Reflection.signature_of(prepare_method)
+
+            return prepare_signature.return_type&.to_s if valid_return_type?(prepare_signature&.return_type)
+          end
+
           Runtime::Reflection.qualified_name_of(constant) || "T.untyped"
         end
 
@@ -85,6 +106,11 @@ module Tapioca
         def has_replaceable_default?(argument)
           !!argument.replace_null_with_default? && !argument.default_value.nil?
         end
+
+        sig { params(return_type: T.nilable(T::Types::Base)).returns(T::Boolean) }
+        def valid_return_type?(return_type)
+          !!return_type && !(T::Private::Types::Void === return_type || T::Private::Types::NotTyped === return_type)
+        end
       end
     end
   end

data/lib/tapioca/dsl/pipeline.rb

@@ -130,7 +130,10 @@ module Tapioca
 
       sig { params(requested_constants: T::Array[Module], requested_paths: T::Array[Pathname]).returns(T::Set[Module]) }
       def gather_constants(requested_constants, requested_paths)
-        constants = active_compilers.map(&:processable_constants).reduce(Set.new, :union)
+        constants = Set.new.compare_by_identity
+        active_compilers.each do |compiler|
+          constants.merge(compiler.processable_constants)
+        end
         constants = filter_anonymous_and_reloaded_constants(constants)
 
         constants &= requested_constants unless requested_constants.empty? && requested_paths.empty?
@@ -158,11 +161,12 @@ module Tapioca
 
         # 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
+        filtered_constants = constants_by_name
           .keys
           .map { |name| T.cast(Runtime::Reflection.constantize(name), Module) }
           .select { |mod| Runtime::Reflection.constant_defined?(mod) }
-          .to_set
+
+        Set.new.compare_by_identity.merge(filtered_constants)
       end
 
       sig { params(constant: Module).returns(T.nilable(RBI::File)) }

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

@@ -97,12 +97,11 @@ module Tapioca
               # method and the parameter is required and there is a single
               # parameter and the signature also defines a single parameter and
               # the name of the method ends with a = character.
-              writer_method_with_sig = (
+              writer_method_with_sig =
                 signature && type == :req &&
                 parameters.size == 1 &&
                 signature.arg_types.size == 1 &&
                 method_name[-1] == "="
-              )
 
               if writer_method_with_sig
                 method_name.delete_suffix("=")

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

@@ -67,8 +67,9 @@ module Tapioca
         sig { params(signature: T.untyped).returns(T::Boolean) }
         def signature_final?(signature)
           modules_with_final = T::Private::Methods.instance_variable_get(:@modules_with_final)
-          final_methods = modules_with_final[signature.owner.object_id]
-
+          # In https://github.com/sorbet/sorbet/pull/7531, Sorbet changed internal hashes to be compared by identity,
+          # starting on version 0.5.11155
+          final_methods = modules_with_final[signature.owner] || modules_with_final[signature.owner.object_id]
           return false unless final_methods
 
           final_methods.include?(signature.method_name)

data/lib/tapioca/helpers/env_helper.rb

@@ -11,7 +11,7 @@ module Tapioca
     sig { params(options: T::Hash[Symbol, T.untyped]).void }
     def set_environment(options) # rubocop:disable Naming/AccessorMethodName
       ENV["RAILS_ENV"] = ENV["RACK_ENV"] = options[:environment]
-      ENV["RUBY_DEBUG_ENABLE"] = "0"
+      ENV["RUBY_DEBUG_LAZY"] = "1"
     end
   end
 end

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.11.12
+  version: 0.11.14
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-12-18 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.4.21
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard