tapioca 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8f364e4169fb5f723942c3e96a7d4dc1790f59d64cb46cfc509ee55259f4cb
-  data.tar.gz: b49aa47178045a367967b8c0b0731270ea8bb008edd2815711cb4764ca6adda6
+  metadata.gz: f19238941e4e663cef8326fc3cd46a9e9fb80b19130b676509d17e9081881fea
+  data.tar.gz: aa1db65b32badf4df8937a9d6566ac409b788cc746c714b40f5f7f0098cd062c
 SHA512:
-  metadata.gz: 0e21aaff68f12f20fcb844153b57bca75cf56765ab21ed1375a5b3c7d9610bc60c4e815b84522dbd27497699675ac27a7a4066e4032cb15b3d00355b5cc4b3d0
-  data.tar.gz: 87f26576c955e276801df3e8e00d3ed222374b430ea2012984127a10da0cc85ba0b166fa381bae6a627c5526d3af3079c63d22c3ef967a527df6b5502143c81e
+  metadata.gz: ba99ab5d35eb0d88cd671370bfbee1e73b72e1a6828c083915c32ed36d7142291b93b79d9258cca9a7bd7d41fcf31770f00865c12c0fe5395cba0d439b9bd850
+  data.tar.gz: 93d5fa3abba74e8919415d494bf47416a36721f4689d5ce893831b39cf4a8f00ca1f9d9c3500fcd70fa574fe2230d9aca6f743bf4c9642817ce969bbbdb6c431

data/lib/tapioca/commands/dsl.rb

@@ -93,7 +93,7 @@ module Tapioca
       def execute
         Loaders::Dsl.load_application(
           tapioca_path: @tapioca_path,
-          eager_load: @requested_constants.empty?,
+          eager_load: @requested_constants.empty? && @requested_paths.empty?,
           app_root: @app_root,
         )
 
@@ -104,17 +104,10 @@ module Tapioca
         end
         say("")
 
-        unless @requested_paths.empty?
-          constants_from_paths = Static::SymbolLoader.symbols_from_paths(@requested_paths).to_a
-          if constants_from_paths.empty?
-            say_error("\nWarning: No constants found in: #{@requested_paths.map(&:to_s).join(", ")}", :yellow)
-          end
-
-          @requested_constants += constants_from_paths
-        end
+        all_requested_constants = @requested_constants + constants_from_requested_paths
 
         outpath = @should_verify ? Pathname.new(Dir.mktmpdir) : @outpath
-        rbi_files_to_purge = existing_rbi_filenames(@requested_constants)
+        rbi_files_to_purge = existing_rbi_filenames(all_requested_constants)
 
         pipeline = create_pipeline
 
@@ -146,7 +139,7 @@ module Tapioca
           if @auto_strictness
             say("")
             validate_rbi_files(
-              command: default_command(:dsl, @requested_constants.join(" ")),
+              command: default_command(:dsl, all_requested_constants.join(" ")),
               gem_dir: @gem_dir,
               dsl_dir: @outpath.to_s,
               auto_strictness: @auto_strictness,
@@ -164,7 +157,8 @@ module Tapioca
       sig { returns(Tapioca::Dsl::Pipeline) }
       def create_pipeline
         Tapioca::Dsl::Pipeline.new(
-          requested_constants: constantize(@requested_constants),
+          requested_constants:
+            constantize(@requested_constants) + constantize(constants_from_requested_paths, ignore_missing: true),
           requested_paths: @requested_paths,
           requested_compilers: constantize_compilers(@only),
           excluded_compilers: constantize_compilers(@exclude),
@@ -189,17 +183,17 @@ module Tapioca
         filenames.to_set
       end
 
-      sig { params(constant_names: T::Array[String]).returns(T::Array[Module]) }
-      def constantize(constant_names)
+      sig { params(constant_names: T::Array[String], ignore_missing: T::Boolean).returns(T::Array[Module]) }
+      def constantize(constant_names, ignore_missing: false)
         constant_map = constant_names.to_h do |name|
           [name, Object.const_get(name)]
         rescue NameError
           [name, nil]
         end
 
-        unprocessable_constants = constant_map.select { |_, v| v.nil? }
+        processable_constants, unprocessable_constants = constant_map.partition { |_, v| !v.nil? }
 
-        unless unprocessable_constants.empty?
+        unless unprocessable_constants.empty? || ignore_missing
           unprocessable_constants.each do |name, _|
             say("Error: Cannot find constant '#{name}'", :red)
             filename = dsl_rbi_filename(name)
@@ -209,7 +203,7 @@ module Tapioca
           raise Thor::Error, ""
         end
 
-        constant_map.values
+        processable_constants.map { |_, constant| constant }
       end
 
       sig { params(compiler_names: T::Array[String]).returns(T::Array[T.class_of(Tapioca::Dsl::Compiler)]) }
@@ -384,6 +378,14 @@ module Tapioca
       def generate_command_for(constant)
         default_command(:dsl, constant)
       end
+
+      sig { returns(T::Array[String]) }
+      def constants_from_requested_paths
+        @constants_from_requested_paths ||= T.let(
+          Static::SymbolLoader.symbols_from_paths(@requested_paths).to_a,
+          T.nilable(T::Array[String]),
+        )
+      end
     end
   end
 end

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

@@ -41,7 +41,7 @@ module Tapioca
         sig { override.void }
         def decorate
           root.create_path(constant) do |mailer|
-            constant.action_methods.to_a.each do |mailer_method|
+            action_methods_for_constant.each do |mailer_method|
               method_def = constant.instance_method(mailer_method)
               parameters = compile_method_parameters_to_rbi(method_def)
               mailer.create_method(
@@ -62,6 +62,13 @@ module Tapioca
             descendants_of(::ActionMailer::Base).reject(&:abstract?)
           end
         end
+
+        private
+
+        sig { returns(T::Array[String]) }
+        def action_methods_for_constant
+          constant.action_methods.to_a
+        end
       end
     end
   end

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

@@ -175,7 +175,7 @@ module Tapioca
 
           sig { override.returns(T::Enumerable[Module]) }
           def gather_constants
-            descendants_of(ActiveRecord::Base).reject(&:abstract_class?)
+            ActiveRecord::Base.descendants.reject(&:abstract_class?)
           end
         end
 

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

@@ -83,7 +83,7 @@ module Tapioca
         class << self
           sig { override.returns(T::Enumerable[Module]) }
           def gather_constants
-            descendants_of(::ActiveRecord::Base)
+            descendants_of(::ActiveRecord::Base).reject(&:abstract_class?)
           end
         end
 

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

@@ -17,11 +17,9 @@ module Tapioca
         def type_for(column_name)
           return ["T.untyped", "T.untyped"] if do_not_generate_strong_types?(@constant)
 
+          column = @constant.columns_hash[column_name]
           column_type = @constant.attribute_types[column_name]
-
           getter_type = type_for_activerecord_value(column_type)
-
-          column = @constant.columns_hash[column_name]
           setter_type =
             case column_type
             when ActiveRecord::Enum::EnumType
@@ -31,7 +29,8 @@ module Tapioca
             end
 
           if column&.null
-            return [as_nilable_type(getter_type), as_nilable_type(setter_type)]
+            getter_type = as_nilable_type(getter_type) unless not_nilable_serialized_column?(column_type)
+            return [getter_type, as_nilable_type(setter_type)]
           end
 
           if column_name == @constant.primary_key ||
@@ -148,6 +147,14 @@ module Tapioca
             "T.untyped"
           end
         end
+
+        sig { params(column_type: T.untyped).returns(T::Boolean) }
+        def not_nilable_serialized_column?(column_type)
+          return false unless column_type.is_a?(ActiveRecord::Type::Serialized)
+          return false unless column_type.coder.is_a?(ActiveRecord::Coders::YAMLColumn)
+
+          [Array.singleton_class, Hash.singleton_class].include?(column_type.coder.object_class.singleton_class)
+        end
       end
     end
   end

data/lib/tapioca/dsl/pipeline.rb

@@ -68,6 +68,10 @@ module Tapioca
           ERROR
         end
 
+        if defined?(::ActiveRecord::Base) && constants_to_process.any? { |c| ::ActiveRecord::Base > c }
+          abort_if_pending_migrations!
+        end
+
         result = Executor.new(
           constants_to_process,
           number_of_workers: @number_of_workers,
@@ -184,6 +188,16 @@ module Tapioca
         handler.call(error)
         exit(1)
       end
+
+      sig { void }
+      def abort_if_pending_migrations!
+        return unless defined?(::Rake)
+
+        Rails.application.load_tasks
+        if Rake::Task.task_defined?("db:abort_if_pending_migrations")
+          Rake::Task["db:abort_if_pending_migrations"].invoke
+        end
+      end
     end
   end
 end

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

@@ -25,6 +25,7 @@ module Tapioca
 
         sig { params(pipeline: Pipeline).void }
         def initialize(pipeline)
+          YARD::Registry.clear
           super(pipeline)
           pipeline.gem.parse_yard_docs
         end

data/lib/tapioca/helpers/rbi_files_helper.rb

@@ -96,7 +96,7 @@ module Tapioca
       )
       say(" Done", :green)
 
-      errors = Spoom::Sorbet::Errors::Parser.parse_string(res.err)
+      errors = Spoom::Sorbet::Errors::Parser.parse_string(res.err || "")
 
       if errors.empty?
         say("  No errors found\n\n", [:green, :bold])

data/lib/tapioca/loaders/dsl.rb

@@ -11,7 +11,7 @@ module Tapioca
 
         sig { params(tapioca_path: String, eager_load: T::Boolean, app_root: String).void }
         def load_application(tapioca_path:, eager_load: true, app_root: ".")
-          loader = new(tapioca_path: tapioca_path, app_root: app_root)
+          loader = new(tapioca_path: tapioca_path, eager_load: eager_load, app_root: app_root)
           loader.load
         end
       end
@@ -20,7 +20,6 @@ module Tapioca
       def load
         load_dsl_extensions
         load_application
-        abort_if_pending_migrations!
         load_dsl_compilers
       end
 
@@ -70,17 +69,6 @@ module Tapioca
 
         say("Done", :green)
       end
-
-      sig { void }
-      def abort_if_pending_migrations!
-        return unless File.exist?("#{@app_root}/config/application.rb")
-        return unless defined?(::Rake)
-
-        Rails.application.load_tasks
-        if Rake::Task.task_defined?("db:abort_if_pending_migrations")
-          Rake::Task["db:abort_if_pending_migrations"].invoke
-        end
-      end
     end
   end
 end

data/lib/tapioca/loaders/loader.rb

@@ -48,11 +48,15 @@ module Tapioca
         eager_load_rails_app if eager_load
       rescue LoadError, StandardError => e
         say(
-          "Tapioca attempted to load the Rails application after encountering a `config/application.rb` file, " \
+          "\nTapioca attempted to load the Rails application after encountering a `config/application.rb` file, " \
             "but it failed. If your application uses Rails please ensure it can be loaded correctly before " \
             "generating RBIs.\n#{e}",
           :yellow,
         )
+        if e.backtrace
+          backtrace = T.must(e.backtrace).join("\n")
+          say(backtrace, :cyan) # TODO: Check verbose flag to print backtrace.
+        end
         say("Continuing RBI generation without loading the Rails application.")
       end
 

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler