tapioca 0.17.6 → 0.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd84d6187e59dc5b8e2a824d4e9e82182c242710a030fec89393e2c10f4419c
-  data.tar.gz: 4e92febe4971b06ac111faa2a544fc404a3b6f718734ac0c06cec97ee631e24e
+  metadata.gz: 489bd75ab0b8322c633ee51dbdb7f0bf4701fbca5cf64401c418d8a7fb454418
+  data.tar.gz: 62e4137c4fb603186d93b2f470148f5a8b7baa73bcfb6ed8b000a519dc1f106a
 SHA512:
-  metadata.gz: b4a8b2f9f6b3b69bd3241d5a0503cbf1866288e9dc92c821d410e031bcd91fcf801e003dd54036a1cd6552708d997f0ffb8c989eb5f033758412dca85c7d358e
-  data.tar.gz: 05101b64f9d9dab404aea76bf51c9966626efaf024ac31a07a181cdcc9cc276e6175f1e0824c8e4724b0795c36130adec8509d960b40eba39b97533fa89dba0c
+  metadata.gz: ef5107149d789dda2d5c426a14b611ab1062f8aaa919ec179805c95bf7ad7d22eaae368ac9e0ed86b61cfac38b5bbbfc2fa65fa262837ce22ff4ee054b5cbf31
+  data.tar.gz: e568320ce79f3e9afa07d1ea1fc58aa7aef422f782b77c4b93707016b680bd2e3c2c971b136016dbf754ed82199e461178467195166f2c7738dec40632ac5de1

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.26")
+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

@@ -20,6 +20,7 @@ module RubyLsp
           # 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
           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,
@@ -38,14 +39,14 @@ module RubyLsp
           fork do
             with_notification_wrapper("route_dsl", "Generating route DSL RBIs") do
               constants = ::Tapioca::Dsl::Compilers::UrlHelpers.gather_constants
-              dsl(constants.map(&:name), "--only=Tapioca::Dsl::Compilers::UrlHelpers", "ActiveSupportConcern")
+              dsl(constants.map(&:name))
             end
           end
         when "fixtures_dsl"
           fork do
             with_notification_wrapper("fixture_dsl", "Generating fixture DSL RBIs") do
               constants = ::Tapioca::Dsl::Compilers::ActiveRecordFixtures.gather_constants
-              dsl(constants.map(&:name), "--only=Tapioca::Dsl::Compilers::ActiveRecordFixtures")
+              dsl(constants.map(&:name))
             end
           end
         end
@@ -59,7 +60,7 @@ module RubyLsp
         end
       end
 
-      def dsl(constants, *args)
+      def dsl(constants)
         load("tapioca/cli.rb") # Reload the CLI to reset thor defaults between requests
 
         ::Tapioca::Cli.addon_mode!
@@ -67,7 +68,6 @@ module RubyLsp
         # Order here is important to avoid having Thor confuse arguments. Do not put an array argument at the end before
         # the list of constants
         arguments = ["dsl"]
-        arguments.concat(args)
         arguments.push("--workers=1")
         arguments.concat(constants)
 

data/lib/tapioca/cli.rb

@@ -301,6 +301,7 @@ module Tapioca
         rbi_formatter: rbi_formatter(options),
         halt_upon_load_error: options[:halt_upon_load_error],
         lsp_addon: options[:lsp_addon],
+        verbose: options[:verbose],
       }
 
       command = if verify
@@ -353,7 +354,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(

data/lib/tapioca/commands/abstract_dsl.rb

@@ -160,7 +160,7 @@ module Tapioca
             remove_file(filename) if File.file?(filename)
           end
 
-          raise Thor::Error, ""
+          raise Tapioca::Error, ""
         end
 
         processable_constants
@@ -295,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

@@ -8,7 +8,7 @@ module Tapioca
       include SorbetHelper
       include RBIFilesHelper
 
-      #: (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
+      #: (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?, ?verbose: bool?) -> void
       def initialize(
         gem_names:,
         exclude:,
@@ -26,7 +26,8 @@ module Tapioca
         dsl_dir: DEFAULT_DSL_DIR,
         rbi_formatter: DEFAULT_RBI_FORMATTER,
         halt_upon_load_error: true,
-        lsp_addon: false
+        lsp_addon: false,
+        verbose: false
       )
         @gem_names = gem_names
         @exclude = exclude
@@ -41,6 +42,7 @@ module Tapioca
         @dsl_dir = dsl_dir
         @rbi_formatter = rbi_formatter
         @lsp_addon = lsp_addon
+        @verbose = verbose
 
         super()
 
@@ -58,6 +60,7 @@ module Tapioca
       #: (Gemfile::GemSpec gem) -> void
       def compile_gem_rbi(gem)
         gem_name = set_color(gem.name, :yellow, :bold)
+        say("Currently compiling #{gem_name}", :cyan) if @verbose
 
         rbi = RBI::File.new(strictness: @typed_overrides[gem.name] || "true")
 
@@ -67,7 +70,7 @@ module Tapioca
           reason: "types exported from the `#{gem.name}` gem",
         ) if @file_header
 
-        rbi.root = Runtime::Trackers::Autoload.with_disabled_exits do
+        rbi.root = Tapioca.with_disabled_exits do
           Tapioca::Gem::Pipeline.new(
             gem,
             include_doc: @include_doc,
@@ -201,7 +204,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

@@ -41,10 +41,11 @@ module Tapioca
 
       #: -> Array[GemInfo]
       def list_gemfile_gems
-        say("Listing gems from Gemfile.lock... ", [:blue, :bold])
-        gemfile = Bundler.read_file("Gemfile.lock")
-        parser = Bundler::LockfileParser.new(gemfile)
-        gem_info = parser.specs.map { |spec| GemInfo.from_spec(spec) }
+        lockfile_path = Bundler.definition.lockfile.basename
+        say("Listing gems from #{lockfile_path}... ", [:blue, :bold])
+
+        specs = Bundler.definition.specs
+        gem_info = specs.map { |spec| GemInfo.from_spec(spec) }
         say("Done", :green)
         gem_info
       end
@@ -85,7 +86,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

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/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/compilers/active_model_attributes.rb

@@ -26,12 +26,16 @@ module Tapioca
       # # typed: true
       #
       # class Shop
+      #   include GeneratedAttributeMethods
       #
-      #   sig { returns(T.nilable(::String)) }
-      #   def name; end
+      #   module GeneratedAttributeMethods
+      #     sig { returns(T.nilable(::String)) }
+      #     def name; end
+      #
+      #     sig { params(name: T.nilable(::String)).returns(T.nilable(::String)) }
+      #     def name=(name); end
+      #   end
       #
-      #   sig { params(name: T.nilable(::String)).returns(T.nilable(::String)) }
-      #   def name=(name); end
       # end
       # ~~~
       #: [ConstantType = (Class[::ActiveModel::Attributes] & ::ActiveModel::Attributes::ClassMethods)]
@@ -45,9 +49,13 @@ module Tapioca
           return if attribute_methods.empty?
 
           root.create_path(constant) do |klass|
-            attribute_methods.each do |method, attribute_type|
-              generate_method(klass, method, attribute_type)
+            klass.create_module("GeneratedAttributeMethods") do |mod|
+              attribute_methods.each do |method, attribute_type|
+                generate_method(mod, method, attribute_type)
+              end
             end
+
+            klass.create_include("GeneratedAttributeMethods")
           end
         end
 

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

@@ -4,6 +4,7 @@
 return unless defined?(ActiveRecord::Base)
 
 require "tapioca/dsl/helpers/active_model_type_helper"
+require "tapioca/dsl/helpers/active_record_column_type_helper"
 require "tapioca/dsl/helpers/active_record_constants_helper"
 
 module Tapioca
@@ -837,9 +838,13 @@ module Tapioca
               end
             when :ids
               if constant.table_exists?
-                primary_key_type = constant.type_for_attribute(constant.primary_key)
-                type = Tapioca::Dsl::Helpers::ActiveModelTypeHelper.type_for(primary_key_type)
-                type = RBIHelper.as_non_nilable_type(type)
+                column_type_helper = Tapioca::Dsl::Helpers::ActiveRecordColumnTypeHelper.new(
+                  constant,
+                  column_type_option: Tapioca::Dsl::Helpers::ActiveRecordColumnTypeHelper::ColumnTypeOption::Persisted,
+                )
+                primary_key = constant.primary_key
+                getter_type, _setter_type = column_type_helper.type_for(primary_key)
+                type = getter_type
                 create_common_method("ids", return_type: "T::Array[#{type}]")
               else
                 create_common_method("ids", return_type: "Array")

data/lib/tapioca/dsl/pipeline.rb

@@ -60,7 +60,7 @@ module Tapioca
             No classes/modules can be matched for RBI generation.
             Please check that the requested classes/modules include processable DSL methods.
           ERROR
-          raise Thor::Error, ""
+          raise Tapioca::Error, ""
         end
 
         if defined?(::ActiveRecord::Base) && constants_to_process.any? { |c| ::ActiveRecord::Base > c }
@@ -82,7 +82,7 @@ module Tapioca
             report_error(msg)
           end
 
-          raise Thor::Error, ""
+          raise Tapioca::Error, ""
         end
 
         result.compact

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

@@ -98,7 +98,13 @@ module Tapioca
           # inherited ancestors, past the location of the constant itself.
           ancestors = Set.new.compare_by_identity.merge(ancestors_of(constant))
 
-          (ancestors - inherited_ancestors).to_a
+          result = (ancestors - inherited_ancestors).to_a
+
+          # Filter out Kernel for modules (but not classes) since modules shouldn't
+          # need to explicitly include Kernel in RBIs
+          result.delete(Kernel) unless Class === constant
+
+          result
         end
       end
     end

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

@@ -32,7 +32,7 @@ module Tapioca
 
         #: (String line) -> bool
         def rbs_comment?(line)
-          line.strip.start_with?(": ", "| ")
+          line.start_with?(": ", "| ")
         end
 
         # @override
@@ -74,7 +74,7 @@ module Tapioca
 
           comments << RBI::Comment.new("") if comments.any? && tags.any?
 
-          tags.sort_by(&:tag_name).each do |tag|
+          tags.sort_by { |tag| [tag.tag_name, tag.name.to_s] }.each do |tag|
             line = +"@#{tag.tag_name}"
 
             tag_name = tag.name

data/lib/tapioca/gem_info.rb

@@ -9,7 +9,7 @@ module Tapioca
     class << self
       extend(T::Sig)
 
-      #: (Bundler::LazySpecification spec) -> GemInfo
+      #: (::Bundler::StubSpecification | ::Gem::Specification spec) -> GemInfo
       def from_spec(spec)
         new(name: spec.name, version: spec.version)
       end

data/lib/tapioca/helpers/config_helper.rb

@@ -83,7 +83,7 @@ module Tapioca
       end.compact
 
       unless errors.empty?
-        raise Thor::Error, build_error_message(config_file, errors)
+        raise Tapioca::Error, build_error_message(config_file, errors)
       end
     ensure
       @validating_config = false

data/lib/tapioca/helpers/rbi_files_helper.rb

@@ -128,7 +128,7 @@ module Tapioca
         update_gem_rbis_strictnesses(redef_errors, gem_dir)
       end
 
-      Kernel.raise Thor::Error, error_messages.join("\n") if parse_errors.any?
+      Kernel.raise Tapioca::Error, error_messages.join("\n") if parse_errors.any?
     end
 
     private

data/lib/tapioca/loaders/gem.rb

@@ -44,13 +44,20 @@ module Tapioca
       #: -> void
       def require_gem_file
         say("Requiring all gems to prepare for compiling... ")
-        begin
+
+        bundle_loaded = true #: bool
+
+        Tapioca.with_disabled_exits do
           load_bundle(@bundle, @prerequire, @postrequire, @halt_upon_load_error)
         rescue LoadError => e
+          bundle_loaded = false
           explain_failed_require(@postrequire, e)
-          exit(1)
         end
 
+        # Can't call exit in the rescue block above, since it will be disabled,
+        # so we check the flag after the block.
+        exit(1) unless bundle_loaded
+
         Runtime::Trackers::Autoload.eager_load_all!
 
         say(" Done", :green)

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

@@ -8,8 +8,6 @@ module Tapioca
         extend Tracker
         extend T::Sig
 
-        NOOP_METHOD = ->(*_args, **_kwargs, &_block) {}
-
         @constant_names_registered_for_autoload = [] #: Array[String]
 
         class << self
@@ -17,7 +15,7 @@ module Tapioca
 
           #: -> void
           def eager_load_all!
-            with_disabled_exits do
+            Tapioca.with_disabled_exits do
               until @constant_names_registered_for_autoload.empty?
                 # Grab the next constant name
                 constant_name = T.must(@constant_names_registered_for_autoload.shift)
@@ -33,24 +31,6 @@ module Tapioca
 
             @constant_names_registered_for_autoload << constant_name
           end
-
-          #: [Result] { -> Result } -> Result
-          def with_disabled_exits(&block)
-            original_abort = Kernel.instance_method(:abort)
-            original_exit = Kernel.instance_method(:exit)
-
-            begin
-              Kernel.define_method(:abort, NOOP_METHOD)
-              Kernel.define_method(:exit, NOOP_METHOD)
-
-              Tapioca.silence_warnings do
-                block.call
-              end
-            ensure
-              Kernel.define_method(:exit, original_exit)
-              Kernel.define_method(:abort, original_abort)
-            end
-          end
         end
       end
     end

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

@@ -53,12 +53,12 @@ end
 class Module
   prepend(Module.new do
     def singleton_method_added(method_name)
-      Tapioca::Runtime::Trackers::MethodDefinition.register(method_name, singleton_class, caller_locations)
+      Tapioca::Runtime::Trackers::MethodDefinition.register(method_name, singleton_class, Kernel.caller_locations)
       super
     end
 
     def method_added(method_name)
-      Tapioca::Runtime::Trackers::MethodDefinition.register(method_name, self, caller_locations)
+      Tapioca::Runtime::Trackers::MethodDefinition.register(method_name, self, Kernel.caller_locations)
       super
     end
   end)

data/lib/tapioca/version.rb

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

data/lib/tapioca.rb

@@ -9,6 +9,9 @@ module Tapioca
 
   @traces = [] #: Array[TracePoint]
 
+  NOOP_METHOD = ->(*_args, **_kwargs, &_block) {} #: ^() -> void
+  private_constant :NOOP_METHOD
+
   class << self
     extend T::Sig
 
@@ -22,6 +25,24 @@ module Tapioca
     ensure
       $VERBOSE = original_verbosity
     end
+
+    #: [Result] { -> Result } -> Result
+    def with_disabled_exits(&block)
+      original_abort = Kernel.instance_method(:abort)
+      original_exit = Kernel.instance_method(:exit)
+
+      begin
+        Kernel.define_method(:abort, NOOP_METHOD)
+        Kernel.define_method(:exit, NOOP_METHOD)
+
+        Tapioca.silence_warnings do
+          block.call
+        end
+      ensure
+        Kernel.define_method(:exit, original_exit)
+        Kernel.define_method(:abort, original_abort)
+      end
+    end
   end
 
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: 0.17.8
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard
   library