tapioca 0.11.13 → 0.11.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 071fd87cab365673ec36e85a0cf657865d2c71d1650d02ae7c17ac3133f124f3
-  data.tar.gz: 34a3b5e83928cb38eefbf57568ca8dc5d16c20ee6653da2ee591d6e3265d8d2a
+  metadata.gz: 52388d4c8afe40a2b6807e54bf1dd09701cb016ca1fed7ce5d3a691c3f93e0e5
+  data.tar.gz: 18550aa93626f63257b387154585dc2ae9e74c5aa17c7d4e2b82702bf5ce5b2b
 SHA512:
-  metadata.gz: d97568a53647ceb3fe4e7bfd33dc3503cb95d8c95791dc0c0bf8429f9974c4a39d5d5e5aca16251ae866a07761f00ddbd5a224925b11c4a8378f682fd4deef1c
-  data.tar.gz: f44cccf226efaa3b0ccda730daf3419acb3cdcaeec7c699c91ba9e2f8b4fe59a7e157331afff1723f69f09ff2fc3ff5a208222b2eb86c1738806170578a3ec2b
+  metadata.gz: c0be5c5d8108519bbda67d2498ff032273ad855a45c464a5a0acf0780412e7f4d3ee706322ef287fd2882ee0083f3c3fe1ab67611a16a6f45f5aa5a7aeb1a709
+  data.tar.gz: 6a87ab2319905c976cfb0b6a004c12d613a9200269268c6c452f8f7ba9175a1b7fd29c5d32de945a04614aff1de037463ad3c0fd090f883770a7f72d7f2f1476

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/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?
@@ -60,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
@@ -77,6 +93,7 @@ module Tapioca
         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)

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.11.13
+  version: 0.11.14
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler