tapioca 0.17.3 → 0.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e446027e2b7e92d0a593cab8758e2c4ea86914b4e92af06c5ef4f9d102740a4e
-  data.tar.gz: 688fb813c21f03b6d9536829d712b064fa8296ff6ccce973d4655c6f576fe37f
+  metadata.gz: d003e839857cc260e7b1ab86fd4a48d93efc53e4a43ac9ccac6c85d9a89e63a1
+  data.tar.gz: 900f2d0369802b0fac34f60c04e3c238cd68e439c1d6d60f4b9ed5d8c82770f0
 SHA512:
-  metadata.gz: '08aaa410199a74707132460863b0cdc7396f5c62c12e8cfd700b6e9bf66aae2df2e77b5bc4818626380c7cfbfa61adeccca1deba7c66547a91e8047b4e65ccb3'
-  data.tar.gz: 59e4b41df9b651a33eb66968d11813a563e29e9a0e43ab73566f33d3de1305be5be20386d1227f95596ebf9c67a4bef82d71dc327952a9e166f7674ff0212218
+  metadata.gz: b2f68a283b2499203877730fb5f981ed1e6c09c686a6c3e59297bea18361b5dd2d1831581f7b3edce6cf38936819544feeeebe59b1747520738542b0ae606ffe
+  data.tar.gz: '09769a8ab2aac1763cadecd013c9979c58d750c052f94c26eccfcbbd0a7ca07e0cb027c18e3737e90b90e85d4bebfca2fb4e8e559fdd9c4a0dd472ce5e59ee77'

data/exe/tapioca

@@ -27,4 +27,9 @@ end
 
 require_relative "../lib/tapioca/internal"
 
-Tapioca::Cli.start(ARGV)
+begin
+  Tapioca::Cli.start(ARGV)
+rescue Tapioca::Error => e
+  warn(e.message)
+  exit(1)
+end

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.27")
 
 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/ruby_lsp/tapioca/server_addon.rb

@@ -19,13 +19,16 @@ module RubyLsp
         when "load_compilers_and_extensions"
           # Load DSL extensions and compilers ahead of time, so that we don't have to pay the price of invoking
           # `Gem.find_files` on every execution, which is quite expensive
-          @loader = ::Tapioca::Loaders::Dsl.new(
-            tapioca_path: ::Tapioca::TAPIOCA_DIR,
-            eager_load: false,
-            app_root: params[:workspace_path],
-            halt_upon_load_error: false,
-          )
-          @loader.load_dsl_extensions_and_compilers
+          with_notification_wrapper("load_compilers_and_extensions", "Loading DSL compilers") do
+            ::Tapioca::Dsl::Compiler.extend(T::Generic)
+            @loader = ::Tapioca::Loaders::Dsl.new(
+              tapioca_path: ::Tapioca::TAPIOCA_DIR,
+              eager_load: false,
+              app_root: params[:workspace_path],
+              halt_upon_load_error: false,
+            )
+            @loader.load_dsl_extensions_and_compilers
+          end
         when "dsl"
           fork do
             with_notification_wrapper("dsl", "Generating DSL RBIs") do

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

@@ -353,7 +353,7 @@ module Tapioca
       default: {}
     def annotations
       if !options[:netrc] && options[:netrc_file]
-        raise Thor::Error, set_color("Options `--no-netrc` and `--netrc-file` can't be used together", :bold, :red)
+        raise Tapioca::Error, set_color("Options `--no-netrc` and `--netrc-file` can't be used together", :bold, :red)
       end
 
       command = Commands::Annotations.new(
@@ -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:,
@@ -161,7 +160,7 @@ module Tapioca
             remove_file(filename) if File.file?(filename)
           end
 
-          raise Thor::Error, ""
+          raise Tapioca::Error, ""
         end
 
         processable_constants
@@ -296,7 +295,7 @@ module Tapioca
             build_error_for_files(cause, diff_for_cause.map(&:first))
           end.join("\n")
 
-          raise Thor::Error, <<~ERROR
+          raise Tapioca::Error, <<~ERROR
             #{set_color("RBI files are out-of-date. In your development environment, please run:", :green)}
               #{set_color("`#{default_command(command)}`", :green, :bold)}
             #{set_color("Once it is complete, be sure to commit and push any changes", :green)}

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:,
@@ -202,7 +201,7 @@ module Tapioca
             build_error_for_files(cause, diff_for_cause.map(&:first))
           end.join("\n")
 
-          raise Thor::Error, <<~ERROR
+          raise Tapioca::Error, <<~ERROR
             #{set_color("RBI files are out-of-date. In your development environment, please run:", :green)}
               #{set_color("`#{default_command(command)}`", :green, :bold)}
             #{set_color("Once it is complete, be sure to commit and push any changes", :green)}

data/lib/tapioca/commands/annotations.rb

@@ -85,7 +85,7 @@ module Tapioca
         end
 
         if indexes.empty?
-          raise Thor::Error, set_color("Can't fetch annotations without sources (no index fetched)", :bold, :red)
+          raise Tapioca::Error, set_color("Can't fetch annotations without sources (no index fetched)", :bold, :red)
         end
 
         indexes
@@ -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/check_shims.rb

@@ -49,7 +49,7 @@ module Tapioca
             result = sorbet("--no-config --print=payload-sources:#{payload_path}")
 
             unless result.status
-              raise Thor::Error, <<~ERROR
+              raise Tapioca::Error, <<~ERROR
                 "Sorbet failed to dump payload"
                 #{result.err}
               ERROR
@@ -87,7 +87,7 @@ module Tapioca
             "\nPlease remove the duplicated definitions from #{@shim_rbi_dir} and #{@todo_rbi_file}", :red
           )
 
-          raise Thor::Error, messages.join("\n")
+          raise Tapioca::Error, messages.join("\n")
         end
 
         say("\nNo duplicates found in shim RBIs", :green)

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/commands/gem_generate.rb

@@ -58,7 +58,7 @@ module Tapioca
           if gem.nil?
             next if @lsp_addon
 
-            raise Thor::Error, set_color("Error: Cannot find gem '#{gem_name}'", :red)
+            raise Tapioca::Error, set_color("Error: Cannot find gem '#{gem_name}'", :red)
           end
 
           gems.concat(gem_dependencies(gem)) if @include_dependencies

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
@@ -117,7 +116,7 @@ module Tapioca
           mod.create_method(
             "build_#{role}",
             parameters: [create_rest_param("args", type: "T.untyped")],
-            return_type: "T.any(#{types.join(", ")})",
+            return_type: types.size == 1 ? types.first : "T.any(#{types.join(", ")})",
           )
         end
 

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