tapioca 0.4.22 → 0.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e3ea6e1fb437f52cfb699c43b4c3d46115592ac09a69aec5a8d0701906f42cd
-  data.tar.gz: 9fba45117a3f1f72ab8d3278838fb7d4a860eaa7cadc03535d99be618e8994c9
+  metadata.gz: 9f5e0d26fdadddd8d95b78403ee2cd71240d8d43475bffec2af018b543c2114b
+  data.tar.gz: '0746977c9a6501ea37011cde413597191822d3cc6e7cbd5258b65acab8ce81e0'
 SHA512:
-  metadata.gz: 6519978a03ff03499f223d810a9f0d2bfd74e406017efb300a72fff0d95e1e08b64d2165ae1b54bad48f8767c5f831fe5f4398185282a5643224499355d7badc
-  data.tar.gz: 28ace672d799beb84aa802fe0773e574d3a827c53e15564d643dbe04e6330d6abb11d640a06b064641781258600ce73f3b5695915caaf9ce0813679dede867b2
+  metadata.gz: 80cf81f29ba50819ddba39cd388aa6f59d93bf99ac02c0a596f888793191e85b48fa9537f258fcd188b73b92ceb30268eb56d1aadac2f9026b9ba101196e24b4
+  data.tar.gz: a78072381e07709ebc2331e6cf988510e2e7a52c4cf24c66e4fb46a08293042cfb3b86619b5176fa023ae317107f741ed668fe8684042f50e927c760aab22612

data/exe/tapioca

@@ -5,6 +5,8 @@ require 'sorbet-runtime'
 
 begin
   T::Configuration.default_checked_level = :never
+  # Suppresses call validation errors
+  T::Configuration.call_validation_error_handler = ->(*) {}
   # Suppresses errors caused by T.cast, T.let, T.must, etc.
   T::Configuration.inline_type_error_handler = ->(*) {}
   # Suppresses errors caused by incorrect parameter ordering

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

@@ -19,6 +19,7 @@ module Tapioca
       #
       # ~~~rb
       # class NotifyUserJob < ActiveJob::Base
+      #   sig { params(user: User).returns(Mail) }
       #   def perform(user)
       #     # ...
       #   end
@@ -31,10 +32,10 @@ module Tapioca
       # # notify_user_job.rbi
       # # typed: true
       # class NotifyUserJob
-      #   sig { params(user: T.untyped).returns(NotifyUserJob) }
+      #   sig { params(user: User).returns(T.any(NotifyUserJob, FalseClass)) }
       #   def self.perform_later(user); end
       #
-      #   sig { params(user: T.untyped).returns(NotifyUserJob) }
+      #   sig { params(user: User).returns(Mail) }
       #   def self.perform_now(user); end
       # end
       # ~~~
@@ -48,16 +49,23 @@ module Tapioca
 
             method = constant.instance_method(:perform)
             parameters = compile_method_parameters_to_parlour(method)
+            return_type = compile_method_return_type_to_parlour(method)
 
-            %w[perform_later perform_now].each do |name|
-              create_method(
-                job,
-                name,
-                parameters: parameters,
-                return_type: constant.name,
-                class_method: true
-              )
-            end
+            create_method(
+              job,
+              "perform_later",
+              parameters: parameters,
+              return_type: "T.any(#{constant.name}, FalseClass)",
+              class_method: true
+            )
+
+            create_method(
+              job,
+              "perform_now",
+              parameters: parameters,
+              return_type: return_type,
+              class_method: true
+            )
           end
         end
 

data/lib/tapioca/compilers/symbol_table/symbol_generator.rb

@@ -17,7 +17,7 @@ module Tapioca
 
         attr_reader(:gem, :indent)
 
-        sig { params(gem: Gemfile::Gem, indent: Integer).void }
+        sig { params(gem: Gemfile::GemSpec, indent: Integer).void }
         def initialize(gem, indent = 0)
           @gem = gem
           @indent = indent
@@ -145,7 +145,15 @@ module Tapioca
         def compile_object(tree, name, value)
           return if symbol_ignored?(name)
           klass = class_of(value)
-          klass_name = name_of(klass)
+
+          klass_name = if klass == ObjectSpace::WeakMap
+            # WeakMap is an implicit generic with one type variable
+            "ObjectSpace::WeakMap[T.untyped]"
+          elsif T::Generic === klass
+            generic_name_of(klass)
+          else
+            name_of(klass)
+          end
 
           if klass_name == "T::Private::Types::TypeAlias"
             tree << RBI::Const.new(name, "T.type_alias { #{T.unsafe(value).aliased_type} }")
@@ -155,8 +163,6 @@ module Tapioca
           return if klass_name&.start_with?("T::Types::", "T::Private::")
 
           type_name = klass_name || "T.untyped"
-          # TODO: Do this in a more generic and clean way.
-          type_name = "#{type_name}[T.untyped]" if type_name == "ObjectSpace::WeakMap"
 
           tree << RBI::Const.new(name, "T.let(T.unsafe(nil), #{type_name})")
         end
@@ -774,6 +780,19 @@ module Tapioca
           name
         end
 
+        sig { params(constant: T.all(Module, T::Generic)).returns(String) }
+        def generic_name_of(constant)
+          type_name = T.must(constant.name)
+          return type_name if type_name =~ /\[.*\]$/
+
+          type_variables = Tapioca::GenericTypeRegistry.lookup_type_variables(constant)
+          return type_name unless type_variables
+
+          type_variable_names = type_variables.map { "T.untyped" }.join(", ")
+
+          "#{type_name}[#{type_variable_names}]"
+        end
+
         sig { params(constant: Module).returns(T.nilable(String)) }
         def name_of_proxy_target(constant)
           klass = class_of(constant)

data/lib/tapioca/compilers/symbol_table_compiler.rb

@@ -8,7 +8,7 @@ module Tapioca
 
       sig do
         params(
-          gem: Gemfile::Gem,
+          gem: Gemfile::GemSpec,
           indent: Integer
         ).returns(String)
       end

data/lib/tapioca/gemfile.rb

@@ -20,7 +20,7 @@ module Tapioca
     sig { returns(Bundler::Definition) }
     attr_reader(:definition)
 
-    sig { returns(T::Array[Gem]) }
+    sig { returns(T::Array[GemSpec]) }
     attr_reader(:dependencies)
 
     sig { returns(T::Array[String]) }
@@ -32,18 +32,18 @@ module Tapioca
       @lockfile = T.let(File.new(Bundler.default_lockfile), File)
       @definition = T.let(Bundler::Dsl.evaluate(gemfile, lockfile, {}), Bundler::Definition)
       dependencies, missing_specs = load_dependencies
-      @dependencies = T.let(dependencies, T::Array[Gem])
+      @dependencies = T.let(dependencies, T::Array[GemSpec])
       @missing_specs = T.let(missing_specs, T::Array[String])
     end
 
-    sig { params(gem_name: String).returns(T.nilable(Gem)) }
+    sig { params(gem_name: String).returns(T.nilable(GemSpec)) }
     def gem(gem_name)
       dependencies.detect { |dep| dep.name == gem_name }
     end
 
     sig { void }
-    def require
-      T.unsafe(runtime).setup(*groups).require(*groups)
+    def require_bundle
+      T.unsafe(runtime).require(*groups)
     end
 
     private
@@ -51,23 +51,32 @@ module Tapioca
     sig { returns(File) }
     attr_reader(:gemfile, :lockfile)
 
-    sig { returns([T::Array[Gem], T::Array[String]]) }
+    sig { returns([T::Array[GemSpec], T::Array[String]]) }
     def load_dependencies
-      deps = definition.locked_gems.dependencies.values
-
-      missing_specs = T::Array[String].new
-
-      dependencies = definition
-        .resolve
-        .materialize(deps, missing_specs)
-        .map { |spec| Gem.new(spec) }
+      materialized_dependencies, missing_specs = materialize_deps
+      dependencies = materialized_dependencies
+        .map { |spec| GemSpec.new(spec) }
         .reject { |gem| gem.ignore?(dir) }
         .uniq(&:rbi_file_name)
         .sort_by(&:rbi_file_name)
-
       [dependencies, missing_specs]
     end
 
+    sig { returns([T::Array[::Gem::Specification], T::Array[String]]) }
+    def materialize_deps
+      deps = definition.locked_gems.dependencies.values
+      missing_specs = T::Array[String].new
+      materialized_dependencies = if definition.resolve.method(:materialize).arity == 1 # Support bundler >= v2.2.25
+        md = definition.resolve.materialize(deps)
+        missing_spec_names = md.missing_specs.map(&:name)
+        missing_specs = T.cast(md.missing_specs.map { |spec| "#{spec.name} (#{spec.version})" }, T::Array[String])
+        md.to_a.reject { |spec| missing_spec_names.include?(spec.name) }
+      else
+        definition.resolve.materialize(deps, missing_specs)
+      end
+      [materialized_dependencies, missing_specs]
+    end
+
     sig { returns(Bundler::Runtime) }
     def runtime
       Bundler::Runtime.new(File.dirname(gemfile.path), definition)
@@ -83,7 +92,7 @@ module Tapioca
       File.expand_path(gemfile.path + "/..")
     end
 
-    class Gem
+    class GemSpec
       extend(T::Sig)
 
       IGNORED_GEMS = T.let(%w{
@@ -108,8 +117,14 @@ module Tapioca
 
       sig { returns(T::Array[Pathname]) }
       def files
-        @spec.full_require_paths.flat_map do |path|
-          Pathname.glob((Pathname.new(path) / "**/*.rb").to_s)
+        if default_gem?
+          @spec.files.map do |file|
+            ruby_lib_dir.join(file)
+          end
+        else
+          @spec.full_require_paths.flat_map do |path|
+            Pathname.glob((Pathname.new(path) / "**/*.rb").to_s)
+          end
         end
       end
 
@@ -125,11 +140,25 @@ module Tapioca
 
       sig { params(path: String).returns(T::Boolean) }
       def contains_path?(path)
-        to_realpath(path).start_with?(full_gem_path) || has_parent_gemspec?(path)
+        if default_gem?
+          files.any? { |file| file.to_s == to_realpath(path) }
+        else
+          to_realpath(path).start_with?(full_gem_path) || has_parent_gemspec?(path)
+        end
       end
 
       private
 
+      sig { returns(T::Boolean) }
+      def default_gem?
+        @spec.respond_to?(:default_gem?) && @spec.default_gem?
+      end
+
+      sig { returns(Pathname) }
+      def ruby_lib_dir
+        Pathname.new(RbConfig::CONFIG["rubylibdir"])
+      end
+
       sig { returns(String) }
       def version_string
         version = @spec.version.to_s

data/lib/tapioca/generator.rb

@@ -260,7 +260,7 @@ module Tapioca
     def load_application(eager_load:)
       say("Loading Rails application... ")
 
-      loader.load_rails(
+      loader.load_rails_application(
         environment_load: true,
         eager_load: eager_load
       )
@@ -456,7 +456,7 @@ module Tapioca
 
     sig do
       params(gem_names: T::Array[String])
-        .returns(T::Array[Gemfile::Gem])
+        .returns(T::Array[Gemfile::GemSpec])
     end
     def gems_to_generate(gem_names)
       return bundle.dependencies if gem_names.empty?
@@ -486,7 +486,7 @@ module Tapioca
       [statement, sigil].compact.join("\n").strip.concat("\n\n")
     end
 
-    sig { params(gem: Gemfile::Gem).void }
+    sig { params(gem: Gemfile::GemSpec).void }
     def compile_gem_rbi(gem)
       compiler = Compilers::SymbolTableCompiler.new
       gem_name = set_color(gem.name, :yellow, :bold)

data/lib/tapioca/internal.rb

@@ -6,6 +6,7 @@ require "tapioca/loader"
 require "tapioca/constant_locator"
 require "tapioca/generic_type_registry"
 require "tapioca/sorbet_ext/generic_name_patch"
+require "tapioca/sorbet_ext/fixed_hash_patch"
 require "tapioca/config"
 require "tapioca/config_builder"
 require "tapioca/generator"

data/lib/tapioca/loader.rb

@@ -14,10 +14,9 @@ module Tapioca
     def load_bundle(initialize_file, require_file)
       require_helper(initialize_file)
 
-      load_rails
-      load_rake
+      gemfile.require_bundle
 
-      require_bundle
+      load_rails_application
 
       require_helper(require_file)
 
@@ -25,14 +24,11 @@ module Tapioca
     end
 
     sig { params(environment_load: T::Boolean, eager_load: T::Boolean).void }
-    def load_rails(environment_load: false, eager_load: false)
+    def load_rails_application(environment_load: false, eager_load: false)
       return unless File.exist?("config/application.rb")
 
-      safe_require("rails")
-
       silence_deprecations
 
-      safe_require("rails/generators/test_case")
       if environment_load
         safe_require("./config/environment")
       else
@@ -56,11 +52,6 @@ module Tapioca
       require(file)
     end
 
-    sig { void }
-    def require_bundle
-      gemfile.require
-    end
-
     sig { returns(T::Array[T.untyped]) }
     def rails_engines
       engines = []
@@ -84,11 +75,6 @@ module Tapioca
       nil
     end
 
-    sig { void }
-    def load_rake
-      safe_require("rake")
-    end
-
     sig { void }
     def silence_deprecations
       # Stop any ActiveSupport Deprecations from being reported

data/lib/tapioca/rbi/rewriters/sort_nodes.rb

@@ -11,9 +11,11 @@ module Tapioca
         def visit(node)
           return unless node.is_a?(Tree)
           visit_all(node.nodes)
+          original_order = node.nodes.map.with_index.to_h
           node.nodes.sort! do |a, b|
             res = node_rank(a) <=> node_rank(b)
             res = node_name(a) <=> node_name(b) if res == 0
+            res = (original_order[a] || 0) <=> (original_order[b] || 0) if res == 0
             res || 0
           end
         end
@@ -23,27 +25,29 @@ module Tapioca
         sig { params(node: Node).returns(Integer) }
         def node_rank(node)
           case node
-          when Group                then kind_rank(node.kind)
-          when Include, Extend      then 0
-          when Helper               then 1
-          when TypeMember           then 2
-          when MixesInClassMethods  then 3
-          when TStructField         then 4
-          when TEnumBlock           then 5
+          when Group                then group_rank(node.kind)
+          when Include, Extend      then 10
+          when Helper               then 20
+          when TypeMember           then 30
+          when MixesInClassMethods  then 40
+          when TStructField         then 50
+          when TEnumBlock           then 60
           when Method
             if node.name == "initialize"
-              7
+              71
+            elsif !node.is_singleton
+              72
             else
-              8
+              73
             end
-          when Scope, Const then 9
+          when Scope, Const then 80
           else
-            10
+            100
           end
         end
 
         sig { params(kind: Group::Kind).returns(Integer) }
-        def kind_rank(kind)
+        def group_rank(kind)
           case kind
           when Group::Kind::Mixins              then 0
           when Group::Kind::Helpers             then 1

data/lib/tapioca/sorbet_ext/fixed_hash_patch.rb

@@ -0,0 +1,20 @@
+# typed: true
+# frozen_string_literal: true
+
+module T
+  module Types
+    class FixedHash
+      def name
+        entries = @types.map do |(k, v)|
+          if Symbol === k && ":#{k}" == k.inspect
+            "#{k}: #{v}"
+          else
+            "#{k.inspect} => #{v}"
+          end
+        end
+
+        "{#{entries.join(', ')}}"
+      end
+    end
+  end
+end

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.26
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,7 @@ files:
 - lib/tapioca/rbi/rewriters/nest_singleton_methods.rb
 - lib/tapioca/rbi/rewriters/sort_nodes.rb
 - lib/tapioca/rbi/visitor.rb
+- lib/tapioca/sorbet_ext/fixed_hash_patch.rb
 - lib/tapioca/sorbet_ext/generic_name_patch.rb
 - lib/tapioca/sorbet_ext/name_patch.rb
 - lib/tapioca/version.rb
@@ -191,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard