tapioca 0.17.8 → 0.17.10

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

@@ -135,7 +135,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             descendants_of(::ActiveRecord::Base).reject(&:abstract_class?)
           end

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

@@ -111,7 +111,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             descendants_of(::ActiveRecord::Base).select do |klass|
               klass.include?(ActiveRecord::TypedStore::Behavior)

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

@@ -74,7 +74,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             descendants_of(::ActiveResource::Base)
           end

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

@@ -38,7 +38,7 @@ module Tapioca
       #   def photo=(attachable); end
       # end
       # ~~~
-      #: [ConstantType = (Module & ::ActiveStorage::Reflection::ActiveRecordExtensions::ClassMethods)]
+      #: [ConstantType = (T::Module[top] & ::ActiveStorage::Reflection::ActiveRecordExtensions::ClassMethods)]
       class ActiveStorage < Compiler
         extend T::Sig
 
@@ -68,7 +68,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             descendants_of(::ActiveRecord::Base)
               .reject(&:abstract_class?)

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

@@ -37,7 +37,7 @@ module Tapioca
       #   mixes_in_class_methods(::Foo::ClassMethods)
       # end
       # ~~~
-      #: [ConstantType = Module]
+      #: [ConstantType = T::Module[top]]
       class ActiveSupportConcern < Compiler
         extend T::Sig
 
@@ -65,7 +65,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_modules.select do |mod|
               name_of(mod) && # i.e. not anonymous
@@ -76,10 +76,10 @@ module Tapioca
           end
 
           # Returns true when `mod` includes other concerns
-          #: (Module mod) -> bool
+          #: (T::Module[top] mod) -> bool
           def has_dependencies?(mod) = dependencies_of(mod).any?
 
-          #: (Module concern) -> Array[Module]
+          #: (T::Module[top] concern) -> Array[T::Module[top]]
           def dependencies_of(concern)
             concern.instance_variable_get(:@_dependencies) || []
           end
@@ -87,12 +87,12 @@ module Tapioca
 
         private
 
-        #: (Module concern) -> Array[Module]
+        #: (T::Module[top] concern) -> Array[T::Module[top]]
         def dependencies_of(concern)
           self.class.dependencies_of(concern)
         end
 
-        #: (?Module concern) -> Array[Module]
+        #: (?T::Module[top] concern) -> Array[T::Module[top]]
         def linearized_dependencies(concern = constant)
           # Grab all the dependencies of the concern
           dependencies = dependencies_of(concern)

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

@@ -97,7 +97,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             descendants_of(::ActiveSupport::CurrentAttributes)
           end

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

@@ -58,7 +58,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             [::Time]
           end

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

@@ -40,7 +40,7 @@ module Tapioca
       #   def github=(value); end
       # end
       # ```
-      #: [ConstantType = Module]
+      #: [ConstantType = T::Module[top]]
       class Config < Compiler
         extend T::Sig
 
@@ -96,7 +96,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             name = ::Config.const_name
             return [] unless Object.const_defined?(name)

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

@@ -88,7 +88,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             descendants_of(::FrozenRecord::Base).reject(&:abstract_class?)
           end

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

@@ -77,7 +77,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_classes.select { |c| GraphQL::Schema::InputObject > c }
           end

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

@@ -74,7 +74,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_classes.select { |c| GraphQL::Schema::Mutation > c && GraphQL::Schema::RelayClassicMutation != c }
           end

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

@@ -59,7 +59,7 @@ module Tapioca
       class IdentityCache < Compiler
         extend T::Sig
 
-        COLLECTION_TYPE = ->(type) { "T::Array[::#{type}]" } #: ^((Module | String) type) -> String
+        COLLECTION_TYPE = ->(type) { "T::Array[::#{type}]" } #: ^((T::Module[top] | String) type) -> String
 
         # @override
         #: -> void
@@ -95,7 +95,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             descendants_of(::ActiveRecord::Base).select do |klass|
               ::IdentityCache::WithoutPrimaryIndex > klass

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

@@ -109,7 +109,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_modules.select do |c|
               name_of(c) && ::JsonApiClient::Resource > c

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

@@ -88,7 +88,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_classes
               .grep(::Kredis::Attributes::ClassMethods)

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

@@ -44,7 +44,7 @@ module Tapioca
       #   end
       # end
       # ~~~
-      #: [ConstantType = Module]
+      #: [ConstantType = T::Module[top]]
       class MixedInClassAttributes < Compiler
         extend T::Sig
 
@@ -63,7 +63,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             # Select all non-anonymous modules that have overridden Module.included
             all_modules.select do |mod|

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

@@ -156,7 +156,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             marker = Google::Protobuf::MessageExts::ClassMethods
 
@@ -168,7 +168,7 @@ module Tapioca
             else
               T.cast(
                 ObjectSpace.each_object(marker).to_a,
-                T::Array[Module],
+                T::Array[T::Module[T.anything]],
               )
             end
 
@@ -269,7 +269,11 @@ module Tapioca
               Field.new(
                 name: descriptor.name,
                 type: type,
-                init_type: "T.nilable(T.any(#{type}, T::Array[#{elem_type}]))",
+                # The FFI implementation accepts Enumerables:
+                # https://github.com/protocolbuffers/protobuf/blob/fc0eda1fd4eff075f1fb2e9249fa4209f0227e33/ruby/lib/google/protobuf/ffi/repeated_field.rb#L361-L366
+                # However the C implementation of the initializer specifically checks for Arrays:
+                # https://github.com/protocolbuffers/protobuf/blob/fc0eda1fd4eff075f1fb2e9249fa4209f0227e33/ruby/ext/google/protobuf_c/message.c#L568-L573
+                init_type: "T.nilable(T::Array[#{elem_type}])",
                 default: "T.unsafe(nil)",
               )
             end

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

@@ -60,7 +60,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_classes.select do |const|
               name = qualified_name_of(const)

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

@@ -87,7 +87,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_classes.select { |c| Sidekiq::Worker > c }
           end

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

@@ -84,7 +84,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_modules.select do |c|
               name_of(c) &&

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

@@ -109,7 +109,7 @@ module Tapioca
       #   end
       # end
       # ~~~
-      #: [ConstantType = (Module & ::StateMachines::ClassMethods)]
+      #: [ConstantType = (T::Module[top] & ::StateMachines::ClassMethods)]
       class StateMachines < Compiler
         extend T::Sig
 
@@ -158,7 +158,7 @@ module Tapioca
           extend T::Sig
 
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             all_classes.select { |mod| ::StateMachines::InstanceMethods > mod }
           end

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

@@ -78,7 +78,7 @@ module Tapioca
       #   include GeneratedUrlHelpersModule
       # end
       # ~~~
-      #: [ConstantType = Module]
+      #: [ConstantType = T::Module[top]]
       class UrlHelpers < Compiler
         extend T::Sig
 
@@ -99,7 +99,7 @@ module Tapioca
         class << self
           extend T::Sig
           # @override
-          #: -> T::Enumerable[Module]
+          #: -> Enumerable[T::Module[top]]
           def gather_constants
             return [] unless defined?(Rails.application) && Rails.application
 
@@ -131,7 +131,7 @@ module Tapioca
             constants.concat(NON_DISCOVERABLE_INCLUDERS).push(GeneratedUrlHelpersModule, GeneratedPathHelpersModule)
           end
 
-          #: -> Array[Module]
+          #: -> Array[T::Module[top]]
           def gather_non_discoverable_includers
             [].tap do |includers|
               if defined?(ActionController::TemplateAssertions) && defined?(ActionDispatch::IntegrationTest)
@@ -146,7 +146,7 @@ module Tapioca
 
           # Returns `true` if `mod` "directly" includes `helper`.
           # For classes, this method will return false if the `helper` is included only by a superclass
-          #: (Module mod, Module helper) -> bool
+          #: (T::Module[top] mod, T::Module[top] helper) -> bool
           private def includes_helper?(mod, helper)
             ancestors = ancestors_of(mod)
 
@@ -161,11 +161,11 @@ module Tapioca
           end
         end
 
-        NON_DISCOVERABLE_INCLUDERS = gather_non_discoverable_includers #: Array[Module]
+        NON_DISCOVERABLE_INCLUDERS = gather_non_discoverable_includers #: Array[T::Module[top]]
 
         private
 
-        #: (RBI::Tree root, Module constant) -> void
+        #: (RBI::Tree root, T::Module[top] constant) -> void
         def generate_module_for(root, constant)
           root.create_module(T.must(constant.name)) do |mod|
             mod.create_include("::ActionDispatch::Routing::UrlFor")
@@ -181,7 +181,7 @@ module Tapioca
           end
         end
 
-        #: (RBI::Scope mod, Module helper_module) -> void
+        #: (RBI::Scope mod, T::Module[top] helper_module) -> void
         def create_mixins_for(mod, helper_module)
           include_helper = constant.ancestors.include?(helper_module) || NON_DISCOVERABLE_INCLUDERS.include?(constant)
           extend_helper = constant.singleton_class.ancestors.include?(helper_module)

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

@@ -22,7 +22,9 @@ module Tapioca
           class << self
             extend T::Sig
 
-            #: (Hash[String, untyped] options) { (String value, ColumnTypeOption default_column_type_option) -> void } -> ColumnTypeOption
+            #: (
+            #|   Hash[String, untyped] options,
+            #| ) { (String value, ColumnTypeOption default_column_type_option) -> void } -> ColumnTypeOption
             def from_options(options, &block)
               column_type_option = Persisted
               value = options["ActiveRecordColumnTypes"]
@@ -152,8 +154,10 @@ module Tapioca
           when ActiveRecord::Type::Serialized
             serialized_column_type(column_type)
           when ->(type) {
-                 defined?(ActiveRecord::Normalization::NormalizedValueType) &&
-                   ActiveRecord::Normalization::NormalizedValueType === type
+                 (defined?(ActiveRecord::Normalization::NormalizedValueType) &&
+                   ActiveRecord::Normalization::NormalizedValueType === type) ||
+                   (defined?(ActiveModel::Attributes::Normalization::NormalizedValueType) &&
+                     ActiveModel::Attributes::Normalization::NormalizedValueType === type)
                }
             type_for_activerecord_value(column_type.cast_type, column_nullability:)
           when ->(type) {

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

@@ -9,7 +9,10 @@ module Tapioca
 
         extend T::Sig
 
-        #: (GraphQL::Schema::Argument argument, (singleton(GraphQL::Schema::Mutation) | singleton(GraphQL::Schema::InputObject)) constant) -> String
+        #: (
+        #|   GraphQL::Schema::Argument argument,
+        #|   (singleton(GraphQL::Schema::Mutation) | singleton(GraphQL::Schema::InputObject)) constant
+        #| ) -> String
         def type_for_argument(argument, constant)
           type = if argument.loads
             loads_type = ::GraphQL::Schema::Wrapper.new(argument.loads)
@@ -34,7 +37,19 @@ module Tapioca
           )
         end
 
-        #: ((GraphQL::Schema::Wrapper | singleton(GraphQL::Schema::Scalar) | singleton(GraphQL::Schema::Enum) | singleton(GraphQL::Schema::Union) | singleton(GraphQL::Schema::Object) | singleton(GraphQL::Schema::Interface) | singleton(GraphQL::Schema::InputObject)) type, ?ignore_nilable_wrapper: bool, ?prepare_method: Method?) -> String
+        #: (
+        #|   (
+        #|     GraphQL::Schema::Wrapper |
+        #|     singleton(GraphQL::Schema::Scalar) |
+        #|     singleton(GraphQL::Schema::Enum) |
+        #|     singleton(GraphQL::Schema::Union) |
+        #|     singleton(GraphQL::Schema::Object) |
+        #|     singleton(GraphQL::Schema::Interface) |
+        #|     singleton(GraphQL::Schema::InputObject)
+        #|   ) type,
+        #|   ?ignore_nilable_wrapper: bool,
+        #|   ?prepare_method: Method?
+        #| ) -> String
         def type_for(type, ignore_nilable_wrapper: false, prepare_method: nil)
           unwrapped_type = type.unwrap
 
@@ -97,7 +112,7 @@ module Tapioca
 
         private
 
-        #: (Module constant) -> String
+        #: (T::Module[top] constant) -> String
         def type_for_constant(constant)
           if constant.instance_methods.include?(:prepare)
             prepare_method = constant.instance_method(:prepare)

data/lib/tapioca/dsl/pipeline.rb

@@ -6,16 +6,16 @@ module Tapioca
     class Pipeline
       extend T::Sig
 
-      #: T::Enumerable[singleton(Compiler)]
+      #: Enumerable[singleton(Compiler)]
       attr_reader :active_compilers
 
-      #: Array[Module]
+      #: Array[T::Module[top]]
       attr_reader :requested_constants
 
       #: Array[Pathname]
       attr_reader :requested_paths
 
-      #: Array[Module]
+      #: Array[T::Module[top]]
       attr_reader :skipped_constants
 
       #: ^(String error) -> void
@@ -24,7 +24,17 @@ module Tapioca
       #: Array[String]
       attr_reader :errors
 
-      #: (requested_constants: Array[Module], ?requested_paths: Array[Pathname], ?requested_compilers: Array[singleton(Compiler)], ?excluded_compilers: Array[singleton(Compiler)], ?error_handler: ^(String error) -> void, ?skipped_constants: Array[Module], ?number_of_workers: Integer?, ?compiler_options: Hash[String, untyped], ?lsp_addon: bool) -> void
+      #: (
+      #|   requested_constants: Array[T::Module[top]],
+      #|   ?requested_paths: Array[Pathname],
+      #|   ?requested_compilers: Array[singleton(Compiler)],
+      #|   ?excluded_compilers: Array[singleton(Compiler)],
+      #|   ?error_handler: ^(String error) -> void,
+      #|   ?skipped_constants: Array[T::Module[top]],
+      #|   ?number_of_workers: Integer?,
+      #|   ?compiler_options: Hash[String, untyped],
+      #|   ?lsp_addon: bool
+      #| ) -> void
       def initialize(
         requested_constants:,
         requested_paths: [],
@@ -48,7 +58,7 @@ module Tapioca
         @errors = [] #: Array[String]
       end
 
-      #: [T] { (Module constant, RBI::File rbi) -> T } -> Array[T]
+      #: [R] { (T::Module[top] constant, RBI::File rbi) -> R } -> Array[R]
       def run(&blk)
         constants_to_process = gather_constants(requested_constants, requested_paths, skipped_constants)
           .select { |c| Module === c } # Filter value constants out
@@ -111,7 +121,7 @@ module Tapioca
 
       private
 
-      #: (Array[singleton(Compiler)] requested_compilers, Array[singleton(Compiler)] excluded_compilers) -> T::Enumerable[singleton(Compiler)]
+      #: (Array[singleton(Compiler)] requested_compilers, Array[singleton(Compiler)] excluded_compilers) -> Enumerable[singleton(Compiler)]
       def gather_active_compilers(requested_compilers, excluded_compilers)
         active_compilers = compilers
         active_compilers -= excluded_compilers
@@ -119,7 +129,11 @@ module Tapioca
         active_compilers
       end
 
-      #: (Array[Module] requested_constants, Array[Pathname] requested_paths, Array[Module] skipped_constants) -> Set[Module]
+      #: (
+      #|   Array[T::Module[top]] requested_constants,
+      #|   Array[Pathname] requested_paths,
+      #|   Array[T::Module[top]] skipped_constants
+      #| ) -> Set[T::Module[top]]
       def gather_constants(requested_constants, requested_paths, skipped_constants)
         Compiler.requested_constants = requested_constants
         constants = Set.new.compare_by_identity
@@ -141,14 +155,14 @@ module Tapioca
         constants
       end
 
-      #: (Set[Module] constants) -> Set[Module]
+      #: (Set[T::Module[top]] constants) -> Set[T::Module[top]]
       def filter_anonymous_and_reloaded_constants(constants)
         # Group constants by their names
         constants_by_name = constants
           .group_by { |c| Runtime::Reflection.name_of(c) }
           .select { |name, _| !name.nil? }
 
-        constants_by_name = T.cast(constants_by_name, T::Hash[String, T::Array[Module]])
+        constants_by_name = T.cast(constants_by_name, T::Hash[String, T::Array[T::Module[T.anything]]])
 
         # Find the constants that have been reloaded
         reloaded_constants = constants_by_name.select { |_, constants| constants.size > 1 }.keys
@@ -164,13 +178,13 @@ module Tapioca
         # set of constants that are actually in memory with those names.
         filtered_constants = constants_by_name
           .keys
-          .map { |name| T.cast(Runtime::Reflection.constantize(name), Module) }
+          .map { |name| T.cast(Runtime::Reflection.constantize(name), T::Module[T.anything]) }
           .select { |mod| Runtime::Reflection.constant_defined?(mod) }
 
         Set.new.compare_by_identity.merge(filtered_constants)
       end
 
-      #: (Module constant) -> RBI::File?
+      #: (T::Module[top] constant) -> RBI::File?
       def rbi_for_constant(constant)
         file = RBI::File.new(strictness: "true")
 

data/lib/tapioca/gem/events.rb

@@ -44,12 +44,12 @@ module Tapioca
       extend T::Sig
 
       # @override
-      #: -> Module
+      #: -> T::Module[top]
       def constant
-        T.cast(@constant, Module)
+        T.cast(@constant, T::Module[T.anything])
       end
 
-      #: (String symbol, Module constant) -> void
+      #: (String symbol, T::Module[top] constant) -> void
       def initialize(symbol, constant)
         super
       end
@@ -62,10 +62,10 @@ module Tapioca
       #: String
       attr_reader :symbol
 
-      #: Module
+      #: T::Module[top]
       attr_reader :constant
 
-      #: (String symbol, Module constant) -> void
+      #: (String symbol, T::Module[top] constant) -> void
       def initialize(symbol, constant)
         super()
         @symbol = symbol
@@ -79,7 +79,7 @@ module Tapioca
       #: RBI::Const
       attr_reader :node
 
-      #: (String symbol, Module constant, RBI::Const node) -> void
+      #: (String symbol, T::Module[top] constant, RBI::Const node) -> void
       def initialize(symbol, constant, node)
         super(symbol, constant)
         @node = node
@@ -92,7 +92,7 @@ module Tapioca
       #: RBI::Scope
       attr_reader :node
 
-      #: (String symbol, Module constant, RBI::Scope node) -> void
+      #: (String symbol, T::Module[top] constant, RBI::Scope node) -> void
       def initialize(symbol, constant, node)
         super(symbol, constant)
         @node = node
@@ -116,7 +116,14 @@ module Tapioca
       #: Array[[Symbol, String]]
       attr_reader :parameters
 
-      #: (String symbol, Module constant, UnboundMethod method, RBI::Method node, untyped signature, Array[[Symbol, String]] parameters) -> void
+      #: (
+      #|   String symbol,
+      #|   T::Module[top] constant,
+      #|   UnboundMethod method,
+      #|   RBI::Method node,
+      #|   untyped signature,
+      #|   Array[[Symbol, String]] parameters
+      #| ) -> void
       def initialize(symbol, constant, method, node, signature, parameters) # rubocop:disable Metrics/ParameterLists
         super(symbol, constant)
         @node = node