tapioca 0.17.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e446027e2b7e92d0a593cab8758e2c4ea86914b4e92af06c5ef4f9d102740a4e
-  data.tar.gz: 688fb813c21f03b6d9536829d712b064fa8296ff6ccce973d4655c6f576fe37f
+  metadata.gz: 8b36e9553bee2459f120edeb6eeaf9a77b25051c352750d17f473445c36d6d4d
+  data.tar.gz: f4777498dd0ed927e8d27f6f49fd0f01d372f2658bb1f6cd0c17494c436977cb
 SHA512:
-  metadata.gz: '08aaa410199a74707132460863b0cdc7396f5c62c12e8cfd700b6e9bf66aae2df2e77b5bc4818626380c7cfbfa61adeccca1deba7c66547a91e8047b4e65ccb3'
-  data.tar.gz: 59e4b41df9b651a33eb66968d11813a563e29e9a0e43ab73566f33d3de1305be5be20386d1227f95596ebf9c67a4bef82d71dc327952a9e166f7674ff0212218
+  metadata.gz: 9d1c5fd8a3af303cbeb24593e3f448c43592389cb28d94be69035d8ba84a33c82ca462e8445d55ef13bcde62a32bccf8333fcbc91d546468a2e5070732fb51c9
+  data.tar.gz: edcc7dc4de8a1975ef2a396ce014137c6f20b796bfa680c8cf5a4e8fba37a04c5127f16bf6965af22993cb2c6e399937972176571e1fcb96efc260a74381f76d

data/lib/ruby_lsp/tapioca/addon.rb

@@ -1,7 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-RubyLsp::Addon.depend_on_ruby_lsp!(">= 0.23.10", "< 0.25")
+RubyLsp::Addon.depend_on_ruby_lsp!(">= 0.23.10", "< 0.26")
 
 begin
   # The Tapioca add-on depends on the Rails add-on to add a runtime component to the runtime server. We can allow the

data/lib/tapioca/bundler_ext/auto_require_hook.rb

@@ -6,12 +6,9 @@ module Tapioca
     # This is a module that gets prepended to `Bundler::Dependency` and
     # makes sure even gems marked as `require: false` are required during
     # `Bundler.require`.
+    # @requires_ancestor: ::Bundler::Dependency
     module AutoRequireHook
       extend T::Sig
-      extend T::Helpers
-
-      requires_ancestor { ::Bundler::Dependency }
-
       @exclude = [] #: Array[String]
       @enabled = false #: bool
 

data/lib/tapioca/cli.rb

@@ -382,12 +382,12 @@ module Tapioca
         # Indicates that we are running from the LSP, set using the `addon_mode!` method
         attr_reader :addon_mode
 
-        sig { void }
+        #: -> void
         def addon_mode!
           @addon_mode = true
         end
 
-        sig { returns(T::Boolean) }
+        #: -> bool
         def exit_on_failure?
           !@addon_mode
         end

data/lib/tapioca/commands/abstract_dsl.rb

@@ -3,12 +3,11 @@
 
 module Tapioca
   module Commands
+    # @abstract
     class AbstractDsl < CommandWithoutTracker
       include SorbetHelper
       include RBIFilesHelper
 
-      abstract!
-
       #: (requested_constants: Array[String], requested_paths: Array[Pathname], outpath: Pathname, only: Array[String], exclude: Array[String], file_header: bool, tapioca_path: String, ?skip_constant: Array[String], ?quiet: bool, ?verbose: bool, ?number_of_workers: Integer?, ?auto_strictness: bool, ?gem_dir: String, ?rbi_formatter: RBIFormatter, ?app_root: String, ?halt_upon_load_error: bool, ?compiler_options: Hash[String, untyped], ?lsp_addon: bool) -> void
       def initialize(
         requested_constants:,

data/lib/tapioca/commands/abstract_gem.rb

@@ -3,12 +3,11 @@
 
 module Tapioca
   module Commands
+    # @abstract
     class AbstractGem < Command
       include SorbetHelper
       include RBIFilesHelper
 
-      abstract!
-
       #: (gem_names: Array[String], exclude: Array[String], include_dependencies: bool, prerequire: String?, postrequire: String, typed_overrides: Hash[String, String], outpath: Pathname, file_header: bool, include_doc: bool, include_loc: bool, include_exported_rbis: bool, ?number_of_workers: Integer?, ?auto_strictness: bool, ?dsl_dir: String, ?rbi_formatter: RBIFormatter, ?halt_upon_load_error: bool, ?lsp_addon: bool?) -> void
       def initialize(
         gem_names:,

data/lib/tapioca/commands/annotations.rb

@@ -125,7 +125,7 @@ module Tapioca
         fetched_gems.keys.map(&:name).sort
       end
 
-      sig { params(repo_uris: T::Array[String], gem_info: GemInfo).returns(T::Boolean) }
+      #: (Array[String] repo_uris, GemInfo gem_info) -> bool
       def fetch_annotation(repo_uris, gem_info)
         gem_name = gem_info.name
         gem_version = gem_info.version

data/lib/tapioca/commands/command.rb

@@ -3,10 +3,9 @@
 
 module Tapioca
   module Commands
+    # @abstract
     class Command
       extend T::Sig
-      extend T::Helpers
-
       class FileWriter < Thor
         include Thor::Actions
       end
@@ -14,8 +13,6 @@ module Tapioca
       include Thor::Base
       include CliHelper
 
-      abstract!
-
       #: -> void
       def initialize
         @file_writer = FileWriter.new #: Thor::Actions
@@ -31,8 +28,9 @@ module Tapioca
 
       private
 
-      sig { abstract.void }
-      def execute; end
+      # @abstract
+      #: -> void
+      def execute = raise NotImplementedError, "Abstract method called"
 
       #: (Symbol command, *String args) -> String
       def default_command(command, *args)

data/lib/tapioca/commands/command_without_tracker.rb

@@ -3,11 +3,8 @@
 
 module Tapioca
   module Commands
+    # @abstract
     class CommandWithoutTracker < Command
-      extend T::Helpers
-
-      abstract!
-
       #: -> void
       def initialize
         Tapioca::Runtime::Trackers.disable_all!

data/lib/tapioca/dsl/compiler.rb

@@ -3,19 +3,15 @@
 
 module Tapioca
   module Dsl
+    # @abstract
+    #: [ConstantType < Module]
     class Compiler
       extend T::Sig
-      extend T::Helpers
-      extend T::Generic
 
       include RBIHelper
       include Runtime::Reflection
       extend Runtime::Reflection
 
-      ConstantType = type_member { { upper: Module } }
-
-      abstract!
-
       #: ConstantType
       attr_reader :constant
 
@@ -35,8 +31,9 @@ module Tapioca
           processable_constants.include?(constant)
         end
 
-        sig { abstract.returns(T::Enumerable[Module]) }
-        def gather_constants; end
+        # @abstract
+        #: -> T::Enumerable[Module]
+        def gather_constants = raise NotImplementedError, "Abstract method called"
 
         #: -> Set[Module]
         def processable_constants
@@ -100,8 +97,9 @@ module Tapioca
         @pipeline.compiler_enabled?(compiler_name)
       end
 
-      sig { abstract.void }
-      def decorate; end
+      # @abstract
+      #: -> void
+      def decorate = raise NotImplementedError, "Abstract method called"
 
       # NOTE: This should eventually accept an `Error` object or `Exception` rather than simply a `String`.
       #: (String error) -> void

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

@@ -32,6 +32,7 @@ module Tapioca
       #   sleeping?, running?, cleaning?
       #   run, run!, run_without_validation!, may_run?
       #
+      #: [ConstantType = (Class[::AASM] & ::AASM::ClassMethods)]
       class AASM < Compiler
         extend T::Sig
 
@@ -68,8 +69,6 @@ module Tapioca
           "success",
         ].freeze #: Array[String]
 
-        ConstantType = type_member { { fixed: T.all(T::Class[::AASM], ::AASM::ClassMethods) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -61,11 +61,10 @@ module Tapioca
       #   def helpers; end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActionController::Base)]
       class ActionControllerHelpers < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::ActionController::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -29,11 +29,10 @@ module Tapioca
       #   def self.notify_customer(customer_id); end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActionMailer::Base)]
       class ActionMailer < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::ActionMailer::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -43,11 +43,10 @@ module Tapioca
       #  def title?; end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveRecord::Base)]
       class ActionText < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -38,11 +38,10 @@ module Tapioca
       #   def self.perform_now(user); end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveJob::Base)]
       class ActiveJob < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveJob::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -34,13 +34,10 @@ module Tapioca
       #   def name=(name); end
       # end
       # ~~~
+      #: [ConstantType = (Class[::ActiveModel::Attributes] & ::ActiveModel::Attributes::ClassMethods)]
       class ActiveModelAttributes < Compiler
         extend T::Sig
 
-        ConstantType = type_member do
-          { fixed: T.all(T::Class[::ActiveModel::Attributes], ::ActiveModel::Attributes::ClassMethods) }
-        end
-
         # @override
         #: -> void
         def decorate

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

@@ -53,13 +53,10 @@ module Tapioca
       #   def token_confirmation=(unencrypted_password); end
       # end
       # ~~~
+      #: [ConstantType = (Class[::ActiveModel::SecurePassword] & ::ActiveModel::SecurePassword::ClassMethods)]
       class ActiveModelSecurePassword < Compiler
         extend T::Sig
 
-        ConstantType = type_member do
-          { fixed: T.all(T::Class[::ActiveModel::SecurePassword], ::ActiveModel::SecurePassword::ClassMethods) }
-        end
-
         # @override
         #: -> void
         def decorate

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

@@ -40,19 +40,10 @@ module Tapioca
       #   def password_confirmation=(password_confirmation); end
       # end
       # ~~~
+      #: [ConstantType = (Class[ActiveModel::Validations] & ActiveModel::Validations::HelperMethods & ActiveModel::Validations::ClassMethods)]
       class ActiveModelValidationsConfirmation < Compiler
         extend T::Sig
 
-        ConstantType = type_member do
-          {
-            fixed: T.all(
-              T::Class[ActiveModel::Validations],
-              ActiveModel::Validations::HelperMethods,
-              ActiveModel::Validations::ClassMethods,
-            ),
-          }
-        end
-
         class << self
           # @override
           #: -> T::Enumerable[Module]

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

@@ -101,6 +101,7 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = singleton(ActiveRecord::Base)]
       class ActiveRecordAssociations < Compiler
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
@@ -121,8 +122,6 @@ module Tapioca
           end
         end
 
-        ConstantType = type_member { { fixed: T.class_of(ActiveRecord::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -120,12 +120,11 @@ module Tapioca
       #     sig { returns(T.untyped) }
       #     def title; end
       # ~~~
+      #: [ConstantType = singleton(ActiveRecord::Base)]
       class ActiveRecordColumns < Compiler
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
 
-        ConstantType = type_member { { fixed: T.class_of(ActiveRecord::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -63,12 +63,11 @@ module Tapioca
       # end
       #
       # ~~~
+      #: [ConstantType = (singleton(ActiveRecord::Base) & Extensions::ActiveRecord)]
       class ActiveRecordDelegatedTypes < Compiler
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
 
-        ConstantType = type_member { { fixed: T.all(T.class_of(ActiveRecord::Base), Extensions::ActiveRecord) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -49,11 +49,10 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveRecord::Base)]
       class ActiveRecordEnum < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -33,10 +33,10 @@ module Tapioca
       #   def posts(fixture_name = nil, *other_fixtures); end
       # end
       # ~~~
+      #: [ConstantType = singleton(ActiveSupport::TestCase)]
       class ActiveRecordFixtures < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(ActiveSupport::TestCase) } }
         MISSING = Object.new
 
         # @override

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

@@ -148,13 +148,12 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveRecord::Base)]
       class ActiveRecordRelations < Compiler
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
         include SorbetHelper
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
-
         # From ActiveRecord::ConnectionAdapter::Quoting#quote, minus nil
         ID_TYPES = [
           "String",
@@ -217,6 +216,17 @@ module Tapioca
           []
         end #: Array[Symbol]
         BATCHES_METHODS = ActiveRecord::Batches.instance_methods(false) #: Array[Symbol]
+        BATCHES_METHODS_PARAMETERS = {
+          start: ["T.untyped", "nil"],
+          finish: ["T.untyped", "nil"],
+          load: ["T.untyped", "false"],
+          batch_size: ["Integer", "1000"],
+          of: ["Integer", "1000"],
+          error_on_ignore: ["T.untyped", "nil"],
+          order: ["Symbol", ":asc"],
+          cursor: ["T.untyped", "primary_key"],
+          use_ranges: ["T.untyped", "nil"],
+        } #: Hash[Symbol, [String, String]]
         CALCULATION_METHODS = ActiveRecord::Calculations.instance_methods(false) #: Array[Symbol]
         ENUMERABLE_QUERY_METHODS = [:any?, :many?, :none?, :one?] #: Array[Symbol]
         FIND_OR_CREATE_METHODS = [
@@ -855,102 +865,31 @@ module Tapioca
           end
 
           BATCHES_METHODS.each do |method_name|
-            case method_name
-            when :find_each
-              order = ActiveRecord::Batches.instance_method(:find_each).parameters.include?([:key, :order])
-
-              common_relation_methods_module.create_method("find_each") do |method|
-                method.add_kw_opt_param("start", "nil")
-                method.add_kw_opt_param("finish", "nil")
-                method.add_kw_opt_param("batch_size", "1000")
-                method.add_kw_opt_param("error_on_ignore", "nil")
-                method.add_kw_opt_param("order", ":asc") if order
-                method.add_block_param("block")
+            block_param, return_type, parameters = batch_method_configs(method_name)
+            next if block_param.nil? || return_type.nil? || parameters.nil?
 
-                method.add_sig do |sig|
-                  sig.add_param("start", "T.untyped")
-                  sig.add_param("finish", "T.untyped")
-                  sig.add_param("batch_size", "Integer")
-                  sig.add_param("error_on_ignore", "T.untyped")
-                  sig.add_param("order", "Symbol") if order
-                  sig.add_param("block", "T.proc.params(object: #{constant_name}).void")
-                  sig.return_type = "void"
-                end
+            common_relation_methods_module.create_method(method_name.to_s) do |method|
+              parameters.each do |name, (style, _type, default)|
+                # The style is always "key", but this is a safeguard to prevent confusing errors in the future.
+                raise "Unexpected style #{style} for #{name}" unless style == :key
 
-                method.add_sig do |sig|
-                  sig.add_param("start", "T.untyped")
-                  sig.add_param("finish", "T.untyped")
-                  sig.add_param("batch_size", "Integer")
-                  sig.add_param("error_on_ignore", "T.untyped")
-                  sig.add_param("order", "Symbol") if order
-                  sig.return_type = "T::Enumerator[#{constant_name}]"
-                end
+                method.add_kw_opt_param(name, T.must(default))
               end
-            when :find_in_batches
-              order = ActiveRecord::Batches.instance_method(:find_in_batches).parameters.include?([:key, :order])
-              common_relation_methods_module.create_method("find_in_batches") do |method|
-                method.add_kw_opt_param("start", "nil")
-                method.add_kw_opt_param("finish", "nil")
-                method.add_kw_opt_param("batch_size", "1000")
-                method.add_kw_opt_param("error_on_ignore", "nil")
-                method.add_kw_opt_param("order", ":asc") if order
-                method.add_block_param("block")
-
-                method.add_sig do |sig|
-                  sig.add_param("start", "T.untyped")
-                  sig.add_param("finish", "T.untyped")
-                  sig.add_param("batch_size", "Integer")
-                  sig.add_param("error_on_ignore", "T.untyped")
-                  sig.add_param("order", "Symbol") if order
-                  sig.add_param("block", "T.proc.params(object: T::Array[#{constant_name}]).void")
-                  sig.return_type = "void"
-                end
+              method.add_block_param("block")
 
-                method.add_sig do |sig|
-                  sig.add_param("start", "T.untyped")
-                  sig.add_param("finish", "T.untyped")
-                  sig.add_param("batch_size", "Integer")
-                  sig.add_param("error_on_ignore", "T.untyped")
-                  sig.add_param("order", "Symbol") if order
-                  sig.return_type = "T::Enumerator[T::Enumerator[#{constant_name}]]"
+              method.add_sig do |sig|
+                parameters.each do |name, (_style, type, _default)|
+                  sig.add_param(name, type)
                 end
+                sig.add_param("block", "T.proc.params(object: #{block_param}).void")
+                sig.return_type = "void"
               end
-            when :in_batches
-              order = ActiveRecord::Batches.instance_method(:in_batches).parameters.include?([:key, :order])
-              use_ranges = ActiveRecord::Batches.instance_method(:in_batches).parameters.include?([:key, :use_ranges])
-
-              common_relation_methods_module.create_method("in_batches") do |method|
-                method.add_kw_opt_param("of", "1000")
-                method.add_kw_opt_param("start", "nil")
-                method.add_kw_opt_param("finish", "nil")
-                method.add_kw_opt_param("load", "false")
-                method.add_kw_opt_param("error_on_ignore", "nil")
-                method.add_kw_opt_param("order", ":asc") if order
-                method.add_kw_opt_param("use_ranges", "nil") if use_ranges
-                method.add_block_param("block")
-
-                method.add_sig do |sig|
-                  sig.add_param("of", "Integer")
-                  sig.add_param("start", "T.untyped")
-                  sig.add_param("finish", "T.untyped")
-                  sig.add_param("load", "T.untyped")
-                  sig.add_param("error_on_ignore", "T.untyped")
-                  sig.add_param("order", "Symbol") if order
-                  sig.add_param("use_ranges", "T.untyped") if use_ranges
-                  sig.add_param("block", "T.proc.params(object: #{RelationClassName}).void")
-                  sig.return_type = "void"
-                end
 
-                method.add_sig do |sig|
-                  sig.add_param("of", "Integer")
-                  sig.add_param("start", "T.untyped")
-                  sig.add_param("finish", "T.untyped")
-                  sig.add_param("load", "T.untyped")
-                  sig.add_param("error_on_ignore", "T.untyped")
-                  sig.add_param("order", "Symbol") if order
-                  sig.add_param("use_ranges", "T.untyped") if use_ranges
-                  sig.return_type = "::ActiveRecord::Batches::BatchEnumerator"
+              method.add_sig do |sig|
+                parameters.each do |name, (_style, type, _default)|
+                  sig.add_param(name, type)
                 end
+                sig.return_type = return_type
               end
             end
           end
@@ -1029,6 +968,31 @@ module Tapioca
           end
         end
 
+        #: (Symbol) -> [String, String, Hash[String, [Symbol, String, String?]]]?
+        def batch_method_configs(method_name)
+          block_param, return_type = case method_name
+          when :find_each
+            [constant_name, "T::Enumerator[#{constant_name}]"]
+          when :find_in_batches
+            ["T::Array[#{constant_name}]", "T::Enumerator[T::Enumerator[#{constant_name}]]"]
+          when :in_batches
+            [RelationClassName, "::ActiveRecord::Batches::BatchEnumerator"]
+          else
+            return
+          end
+
+          parameters = {}
+
+          ActiveRecord::Batches.instance_method(method_name).parameters.each do |style, name|
+            type, default = BATCHES_METHODS_PARAMETERS[name]
+            next if type.nil?
+
+            parameters[name.to_s] = [style, type, default]
+          end
+
+          [block_param, return_type, parameters]
+        end
+
         #: ((Symbol | String) name, ?parameters: Array[RBI::TypedParam], ?return_type: String?) -> void
         def create_common_method(name, parameters: [], return_type: nil)
           common_relation_methods_module.create_method(

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

@@ -38,12 +38,11 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveRecord::Base)]
       class ActiveRecordScope < Compiler
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -32,12 +32,11 @@ module Tapioca
       #   def regenerate_auth_token; end
       # end
       # ~~~
+      #: [ConstantType = (singleton(ActiveRecord::Base) & Extensions::ActiveRecord)]
       class ActiveRecordSecureToken < Compiler
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
 
-        ConstantType = type_member { { fixed: T.all(T.class_of(ActiveRecord::Base), Extensions::ActiveRecord) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -78,12 +78,11 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = (singleton(ActiveRecord::Base) & Extensions::ActiveRecord)]
       class ActiveRecordStore < Compiler
         extend T::Sig
         include Helpers::ActiveRecordConstantsHelper
 
-        ConstantType = type_member { { fixed: T.all(T.class_of(ActiveRecord::Base), Extensions::ActiveRecord) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -81,11 +81,10 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveRecord::Base)]
       class ActiveRecordTypedStore < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -54,11 +54,10 @@ module Tapioca
       #   def year?; end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveResource::Base)]
       class ActiveResource < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveResource::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -38,18 +38,10 @@ module Tapioca
       #   def photo=(attachable); end
       # end
       # ~~~
+      #: [ConstantType = (Module & ::ActiveStorage::Reflection::ActiveRecordExtensions::ClassMethods)]
       class ActiveStorage < Compiler
         extend T::Sig
 
-        ConstantType = type_member do
-          {
-            fixed: T.all(
-              Module,
-              ::ActiveStorage::Reflection::ActiveRecordExtensions::ClassMethods,
-            ),
-          }
-        end
-
         # @override
         #: -> void
         def decorate

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

@@ -37,11 +37,10 @@ module Tapioca
       #   mixes_in_class_methods(::Foo::ClassMethods)
       # end
       # ~~~
+      #: [ConstantType = Module]
       class ActiveSupportConcern < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: Module } }
-
         # @override
         #: -> void
         def decorate

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

@@ -59,11 +59,10 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveSupport::CurrentAttributes)]
       class ActiveSupportCurrentAttributes < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveSupport::CurrentAttributes) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -34,11 +34,10 @@ module Tapioca
       #   end
       # end
       # ```
+      #: [ConstantType = singleton(::Time)]
       class ActiveSupportTimeExt < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::Time) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -40,13 +40,12 @@ module Tapioca
       #   def github=(value); end
       # end
       # ```
+      #: [ConstantType = Module]
       class Config < Compiler
         extend T::Sig
 
         CONFIG_OPTIONS_SUFFIX = "ConfigOptions"
 
-        ConstantType = type_member { { fixed: Module } }
-
         # @override
         #: -> void
         def decorate

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

@@ -58,11 +58,10 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = (singleton(::FrozenRecord::Base) & Extensions::FrozenRecord)]
       class FrozenRecord < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.all(T.class_of(::FrozenRecord::Base), Extensions::FrozenRecord) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -34,11 +34,10 @@ module Tapioca
       #   def post_id; end
       # end
       # ~~~
+      #: [ConstantType = singleton(GraphQL::Schema::InputObject)]
       class GraphqlInputObject < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(GraphQL::Schema::InputObject) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -35,11 +35,10 @@ module Tapioca
       #   def resolve(body:, post_id:); end
       # end
       # ~~~
+      #: [ConstantType = singleton(GraphQL::Schema::Mutation)]
       class GraphqlMutation < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(GraphQL::Schema::Mutation) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -55,13 +55,12 @@ module Tapioca
       #   def fetch_by_title_and_review_date(title, review_date, includes: nil); end
       # end
       # ~~~
+      #: [ConstantType = singleton(::ActiveRecord::Base)]
       class IdentityCache < Compiler
         extend T::Sig
 
         COLLECTION_TYPE = ->(type) { "T::Array[::#{type}]" } #: ^((Module | String) type) -> String
 
-        ConstantType = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -79,11 +79,10 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = singleton(::JsonApiClient::Resource)]
       class JsonApiClientResource < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::JsonApiClient::Resource) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -63,13 +63,10 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = (Class[::Kredis::Attributes] & ::Kredis::Attributes::ClassMethods & Extensions::Kredis)]
       class Kredis < Compiler
         extend T::Sig
 
-        ConstantType = type_member do
-          { fixed: T.all(T::Class[::Kredis::Attributes], ::Kredis::Attributes::ClassMethods, Extensions::Kredis) }
-        end
-
         # @override
         #: -> void
         def decorate

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

@@ -44,11 +44,10 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = Module]
       class MixedInClassAttributes < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: Module } }
-
         # @override
         #: -> void
         def decorate

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

@@ -64,6 +64,7 @@ module Tapioca
       # ~~~
       # --ignore=/path/to/proto/cart_pb.rb
       # ~~~
+      #: [ConstantType = Class[top]]
       class Protobuf < Compiler
         class Field < T::Struct
           prop :name, String
@@ -74,8 +75,6 @@ module Tapioca
 
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T::Class[T.anything] } }
-
         FIELD_RE = /^[a-z_][a-zA-Z0-9_]*$/
 
         # @override

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

@@ -33,13 +33,12 @@ module Tapioca
       #   def skip_comments; end
       # end
       # ~~~
+      #: [ConstantType = singleton(::Rails::Generators::Base)]
       class RailsGenerators < Compiler
         extend T::Sig
 
         BUILT_IN_MATCHER = /::(ActionMailbox|ActionText|ActiveRecord|Rails)::Generators/
 
-        ConstantType = type_member { { fixed: T.class_of(::Rails::Generators::Base) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -41,11 +41,10 @@ module Tapioca
       # as accepted values for the `interval` parameter:
       # * `self.perform_at` will also accept a `ActiveSupport::TimeWithZone` value
       # * `self.perform_in` will also accept a `ActiveSupport::Duration` value
+      #: [ConstantType = singleton(::Sidekiq::Worker)]
       class SidekiqWorker < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::Sidekiq::Worker) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -54,11 +54,10 @@ module Tapioca
       #   def enabled=(enabled); end
       # end
       # ~~~
+      #: [ConstantType = singleton(::SmartProperties)]
       class SmartProperties < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.class_of(::SmartProperties) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -109,11 +109,10 @@ module Tapioca
       #   end
       # end
       # ~~~
+      #: [ConstantType = (Module & ::StateMachines::ClassMethods)]
       class StateMachines < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: T.all(Module, ::StateMachines::ClassMethods) } }
-
         # @override
         #: -> void
         def decorate

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

@@ -78,11 +78,10 @@ module Tapioca
       #   include GeneratedUrlHelpersModule
       # end
       # ~~~
+      #: [ConstantType = Module]
       class UrlHelpers < Compiler
         extend T::Sig
 
-        ConstantType = type_member { { fixed: Module } }
-
         # @override
         #: -> void
         def decorate

data/lib/tapioca/gem/events.rb

@@ -3,11 +3,9 @@
 
 module Tapioca
   module Gem
+    # @abstract
     class Event
       extend T::Sig
-      extend T::Helpers
-
-      abstract!
     end
 
     class SymbolFound < Event
@@ -57,12 +55,10 @@ module Tapioca
       end
     end
 
+    # @abstract
     class NodeAdded < Event
-      extend T::Helpers
       extend T::Sig
 
-      abstract!
-
       #: String
       attr_reader :symbol
 

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

@@ -4,12 +4,9 @@
 module Tapioca
   module Gem
     module Listeners
+      # @abstract
       class Base
         extend T::Sig
-        extend T::Helpers
-
-        abstract!
-
         #: (Pipeline pipeline) -> void
         def initialize(pipeline)
           @pipeline = pipeline

data/lib/tapioca/helpers/cli_helper.rb

@@ -2,12 +2,9 @@
 # frozen_string_literal: true
 
 module Tapioca
+  # @requires_ancestor: Thor::Shell
   module CliHelper
     extend T::Sig
-    extend T::Helpers
-
-    requires_ancestor { Thor::Shell }
-
     #: (?String message, *(Symbol | Array[Symbol]) color) -> void
     def say_error(message = "", *color)
       # Thor has its own `say_error` now, but it has two problems:

data/lib/tapioca/helpers/config_helper.rb

@@ -2,12 +2,9 @@
 # frozen_string_literal: true
 
 module Tapioca
+  # @requires_ancestor: Thor
   module ConfigHelper
     extend T::Sig
-    extend T::Helpers
-
-    requires_ancestor { Thor }
-
     #: String
     attr_reader :command_name
 

data/lib/tapioca/helpers/env_helper.rb

@@ -2,12 +2,9 @@
 # frozen_string_literal: true
 
 module Tapioca
+  # @requires_ancestor: Thor
   module EnvHelper
     extend T::Sig
-    extend T::Helpers
-
-    requires_ancestor { Thor }
-
     #: (Hash[Symbol, untyped] options) -> void
     def set_environment(options) # rubocop:disable Naming/AccessorMethodName
       ENV["RAILS_ENV"] = ENV["RACK_ENV"] = options[:environment]

data/lib/tapioca/helpers/rbi_files_helper.rb

@@ -2,13 +2,10 @@
 # frozen_string_literal: true
 
 module Tapioca
+  # @requires_ancestor: Thor::Shell
+  # @requires_ancestor: SorbetHelper
   module RBIFilesHelper
     extend T::Sig
-    extend T::Helpers
-
-    requires_ancestor { Thor::Shell }
-    requires_ancestor { SorbetHelper }
-
     #: (RBI::Index index, String kind, String file) -> void
     def index_rbi(index, kind, file)
       return unless File.exist?(file)

data/lib/tapioca/helpers/test/content.rb

@@ -4,12 +4,9 @@
 module Tapioca
   module Helpers
     module Test
+      # @requires_ancestor: Kernel
       module Content
         extend T::Sig
-        extend T::Helpers
-
-        requires_ancestor { Kernel }
-
         #: -> void
         def teardown
           super

data/lib/tapioca/helpers/test/dsl_compiler.rb

@@ -10,16 +10,13 @@ require "tapioca/helpers/sorbet_helper"
 module Tapioca
   module Helpers
     module Test
+      # @requires_ancestor: Kernel
       module DslCompiler
         extend T::Sig
-        extend T::Helpers
-
         include Isolation
         include Content
         include Template
 
-        requires_ancestor { Kernel }
-
         #: (singleton(Tapioca::Dsl::Compiler) compiler_class) -> void
         def use_dsl_compiler(compiler_class)
           @context = CompilerContext.new(compiler_class) #: CompilerContext?

data/lib/tapioca/helpers/test/isolation.rb

@@ -28,12 +28,9 @@ module Tapioca
           Marshal.load(serialized)
         end
 
+        # @requires_ancestor: Kernel
         module Forking
           extend T::Sig
-          extend T::Helpers
-
-          requires_ancestor { Kernel }
-
           #: ?{ (?) -> untyped } -> String
           def run_in_isolation(&_blk)
             read, write = IO.pipe
@@ -73,11 +70,9 @@ module Tapioca
           end
         end
 
+        # @requires_ancestor: Kernel
         module Subprocess
           extend T::Sig
-          extend T::Helpers
-
-          requires_ancestor { Kernel }
 
           ORIG_ARGV = ARGV.dup #: Array[String]
 

data/lib/tapioca/helpers/test/template.rb

@@ -4,12 +4,9 @@
 module Tapioca
   module Helpers
     module Test
+      # @requires_ancestor: Kernel
       module Template
         extend T::Sig
-        extend T::Helpers
-
-        requires_ancestor { Kernel }
-
         ERB_SUPPORTS_KVARGS = ::ERB.instance_method(:initialize).parameters.assoc(:key) #: [Symbol, Symbol]?
 
         #: (String selector) -> bool

data/lib/tapioca/loaders/loader.rb

@@ -3,18 +3,16 @@
 
 module Tapioca
   module Loaders
+    # @abstract
     class Loader
       extend T::Sig
-      extend T::Helpers
-
       include Thor::Base
       include CliHelper
       include Tapioca::GemHelper
 
-      abstract!
-
-      sig { abstract.void }
-      def load; end
+      # @abstract
+      #: -> void
+      def load = raise NotImplementedError, "Abstract method called"
 
       private
 

data/lib/tapioca/repo_index.rb

@@ -4,8 +4,6 @@
 module Tapioca
   class RepoIndex
     extend T::Sig
-    extend T::Generic
-
     class << self
       extend T::Sig
 

data/lib/tapioca/runtime/attached_class_of_legacy.rb

@@ -7,12 +7,9 @@ module Tapioca
     # older than 3.2. Because the Class#attached_object method is not
     # available, it implements finding the attached class of a singleton
     # class by iterating through ObjectSpace.
+    # @requires_ancestor: Tapioca::Runtime::Reflection
     module AttachedClassOf
       extend T::Sig
-      extend T::Helpers
-
-      requires_ancestor { Tapioca::Runtime::Reflection }
-
       #: (Class singleton_class) -> Module?
       def attached_class_of(singleton_class)
         # https://stackoverflow.com/a/36622320/98634

data/lib/tapioca/runtime/trackers/tracker.rb

@@ -4,12 +4,9 @@
 module Tapioca
   module Runtime
     module Trackers
+      # @abstract
       module Tracker
         extend T::Sig
-        extend T::Helpers
-
-        abstract!
-
         class << self
           extend T::Sig
 

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.17.4
 platform: ruby
 authors:
 - Ufuk Kayserilioglu